Update humanoid.dm

2017-09-30 02:13:33 -05:00
parent b728fd6160
commit d7db5f23cb
1 changed files with 0 additions and 1 deletions
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 /mob/living/carbon/alien/humanoid
 	name = "alien"
 	icon_state = "alien"