Update mob.dm

2017-11-14 16:10:46 -06:00
parent 8136148303
commit 0885c57b39
1 changed files with 0 additions and 4 deletions
@@ -395,10 +395,6 @@
 		pulling = null
 		grab_state = 0
 		update_pull_hud_icon()
-<<<<<<< HEAD
-
-=======
->>>>>>> 3f58245... Minor speedups to movement: First Blood Part 2 (#32702)
 		if(isliving(ex_pulled))
 			var/mob/living/L = ex_pulled
 			L.update_canmove()// mob gets up if it was lyng down in a chokehold