From 892cb0a1be96c7916f7fb4d1f1257ef0a103b041 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Wed, 2 May 2018 10:35:31 -0400
Subject: [PATCH] Update reverse_bear_trap.dm

---
 code/game/objects/items/devices/reverse_bear_trap.dm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/game/objects/items/devices/reverse_bear_trap.dm b/code/game/objects/items/devices/reverse_bear_trap.dm
index 088be968c5..04679f92e7 100644
--- a/code/game/objects/items/devices/reverse_bear_trap.dm
+++ b/code/game/objects/items/devices/reverse_bear_trap.dm
@@ -80,13 +80,8 @@
 			return
 	..()
 
-<<<<<<< HEAD
-/obj/item/device/reverse_bear_trap/attack(mob/living/target, mob/living/user)
-	if(target.get_item_by_slot(slot_head))
-=======
 /obj/item/reverse_bear_trap/attack(mob/living/target, mob/living/user)
 	if(target.get_item_by_slot(SLOT_HEAD))
->>>>>>> ecd0d8b... Merge pull request #37476 from AnturK/thisalwaysbuggedme
 		to_chat(user, "<span class='warning'>Remove their headgear first!</span>")
 		return
 	target.visible_message("<span class='warning'>[user] starts forcing [src] onto [target]'s head!</span>", \