From c4ac6e63f7b21e1503caad597ce12f9ca3fb95e9 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sun, 1 Apr 2018 17:39:41 -0500
Subject: [PATCH] Update combat.dm

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

diff --git a/code/modules/mob/living/carbon/monkey/combat.dm b/code/modules/mob/living/carbon/monkey/combat.dm
index 22b4d6e4f0..e325e9c19e 100644
--- a/code/modules/mob/living/carbon/monkey/combat.dm
+++ b/code/modules/mob/living/carbon/monkey/combat.dm
@@ -477,8 +477,6 @@
 		dropItemToGround(A, TRUE)
 		update_icons()
 
-<<<<<<< HEAD
-=======
 /mob/living/carbon/monkey/grabbedby(mob/living/carbon/user)
 	. = ..()
 	if(!IsDeadOrIncap() && pulledby && (mode != MONKEY_IDLE || prob(MONKEY_PULL_AGGRO_PROB))) // nuh uh you don't pull me!
@@ -487,6 +485,5 @@
 			monkey_attack(pulledby)
 			retaliate(pulledby)
 			return TRUE
-
->>>>>>> c67b0c1... bad zombie monkey
+			
 #undef MAX_RANGE_FIND