From c1755468b7283367b538d1a80f15e125fe787c0e Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Mon, 7 May 2018 08:50:32 -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 09c0c236ab..58a0ef2874 100644
--- a/code/game/objects/items/devices/reverse_bear_trap.dm
+++ b/code/game/objects/items/devices/reverse_bear_trap.dm
@@ -82,13 +82,8 @@
 	..()
 
 /obj/item/reverse_bear_trap/attack(mob/living/target, mob/living/user)
-<<<<<<< HEAD
 	if(target.get_item_by_slot(slot_head))
-		to_chat(user, "<span class='warning'>Remove their headgear first!</span>")
-=======
-	if(target.get_item_by_slot(SLOT_HEAD))
 		to_chat(user, "<span class='warning'>Remove [target.p_their()] headgear first!</span>")
->>>>>>> ba1030f... Makes more messages pronoun sensitive (#37582)
 		return
 	target.visible_message("<span class='warning'>[user] starts forcing [src] onto [target]'s head!</span>", \
 	"<span class='userdanger'>[target] starts forcing [src] onto your head!</span>", "<i>You hear clanking.</i>")