Update golems.dm

2017-10-29 22:41:23 -05:00
parent 284b265a65
commit 48cc684de0
1 changed files with 0 additions and 5 deletions
--- a/code/modules/mob/living/carbon/human/species_types/golems.dm
+++ b/code/modules/mob/living/carbon/human/species_types/golems.dm
@@ -648,13 +648,8 @@
 	has_corpse = TRUE
 	blacklisted = TRUE
 	dangerous_existence = TRUE
-<<<<<<< HEAD
-  
-=======
 	random_eligible = FALSE

-
->>>>>>> def425f... Excludes clockwork wargolems from golem mutation toxin, nerfs normal clockwork golems (#32041)
 /datum/species/golem/cloth
 	name = "Cloth Golem"
 	id = "cloth golem"