Update hostile.dm

2017-11-22 17:53:36 -05:00
parent 8458dc952c
commit c97e8805f6
1 changed files with 0 additions and 4 deletions
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -372,12 +372,8 @@
 		P.preparePixelProjectile(targeted_atom, src)
 		P.fire()
 		return P
-<<<<<<< HEAD
-		
-=======


->>>>>>> ce82a2e... Fixes hostile mobs attacking surrounding tiles when trying to attack someone: the stunning finale (#32699)
 /mob/living/simple_animal/hostile/proc/CanSmashTurfs(turf/T)
 	return iswallturf(T) || ismineralturf(T)