Update living.dm

2017-12-28 23:58:07 -06:00
parent bf7838aded
commit b3793ee6d4
1 changed files with 0 additions and 3 deletions
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1064,8 +1064,6 @@
 /mob/living/onTransitZ(old_z,new_z)
 	..()
 	update_z(new_z)
-<<<<<<< HEAD
-=======

 /mob/living/MouseDrop(mob/over)
 	. = ..()
@@ -1094,4 +1092,3 @@
 		return FALSE
 	mob_pickup(user)
 	return TRUE
->>>>>>> e3d69de... [READY]Adds picking up corgis and pAIs! (#33442)