From d7db5f23cbeb76a669e55706568531434e2535e2 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 30 Sep 2017 02:13:33 -0500 Subject: [PATCH] Update humanoid.dm --- code/modules/mob/living/carbon/alien/humanoid/humanoid.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index b29f39ad40..9d9e327fec 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -1,4 +1,3 @@ -<<<<<<< HEAD /mob/living/carbon/alien/humanoid name = "alien" icon_state = "alien"