Update human_defines.dm

2017-10-23 14:15:30 -05:00
parent 9367eb23c5
commit f0a32458bb
1 changed files with 0 additions and 3 deletions
@@ -47,7 +47,4 @@
 	buckle_lying = FALSE

 	var/creamed = FALSE //to use with creampie overlays
-<<<<<<< HEAD
-=======
 	var/static/list/can_ride_typecache = typecacheof(list(/mob/living/carbon/human, /mob/living/simple_animal/slime, /mob/living/simple_animal/parrot))
->>>>>>> 8e434b7... Removes duplicate typecaches (#31883)