From c53a08d9388d01ec0f143292676715f8ca182d8d Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sat, 31 Aug 2019 22:21:44 -0400
Subject: [PATCH] Update human_attackhand.dm

---
 code/modules/mob/living/carbon/human/human_attackhand.dm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm
index 7bec330f648..3e7c683af27 100644
--- a/code/modules/mob/living/carbon/human/human_attackhand.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -126,13 +126,10 @@
 
 			H.do_attack_animation(src)
 			playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
-<<<<<<< HEAD
 			//VORESTATION EDIT
 			visible_message("<span class='warning'>[M] has grabbed [src] [(M.zone_sel.selecting == BP_L_HAND || M.zone_sel.selecting == BP_R_HAND)? "by [(gender==FEMALE)? "her" : ((gender==MALE)? "his": "their")] hands": "passively"]!</span>")
 			//VORESTATION END END
-=======
-			visible_message("<span class='warning'>[M] has grabbed [src] passively!</span>")
->>>>>>> 49a8e3b... Merge pull request #6428 from Screemonster/icastfist
+
 			return TRUE
 
 		if(I_HURT)