From accfb2c9bee1606f72abad595ab09c5e08bde6c1 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Fri, 28 Feb 2020 21:21:47 -0500
Subject: [PATCH] Update human_attackhand.dm

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

diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm
index 9e82a77a993..9a1da10910a 100644
--- a/code/modules/mob/living/carbon/human/human_attackhand.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -126,14 +126,9 @@
 
 			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][(M.zone_sel.selecting == "l_hand" || M.zone_sel.selecting == "r_hand")? " by their hands!":" passively!"]</span>")
->>>>>>> 381a613... Merge pull request #6754 from listerla/handholding
 			return TRUE
 
 		if(I_HURT)