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

---
 code/modules/mob/living/carbon/human/human_attackhand.dm | 4 ----
 1 file changed, 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 3e7c683af2..1d7dd6d57a 100644
--- a/code/modules/mob/living/carbon/human/human_attackhand.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -430,8 +430,4 @@
 		else
 			user.visible_message("\The [user] stops applying pressure to [src]'s [organ.name]!", "You stop applying pressure to [src]'s [organ.name]!")
 
-<<<<<<< HEAD
 	return TRUE 
-=======
-	return TRUE
->>>>>>> 49a8e3b... Merge pull request #6428 from Screemonster/icastfist