Update combat.dm

2018-04-01 17:39:41 -05:00
parent df9894ff4b
commit c4ac6e63f7
1 changed files with 1 additions and 4 deletions
@@ -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