From a8043202c2cab2154bd015cc29501cc26dc73e7c Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Wed, 27 Sep 2017 22:43:57 -0500
Subject: [PATCH] Update golems.dm

---
 .../mob/living/carbon/human/species_types/golems.dm        | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm
index b0d22845b1..0706e7ecfc 100644
--- a/code/modules/mob/living/carbon/human/species_types/golems.dm
+++ b/code/modules/mob/living/carbon/human/species_types/golems.dm
@@ -586,9 +586,6 @@
 		H.adjustFireLoss(-4)
 		H.reagents.remove_reagent(chem.id, REAGENTS_METABOLISM)
 
-<<<<<<< HEAD
-=======
-
 /datum/species/golem/clockwork
 	name = "Clockwork Golem"
 	id = "clockwork golem"
@@ -639,9 +636,7 @@
 	has_corpse = TRUE
 	blacklisted = TRUE
 	dangerous_existence = TRUE
-
-
->>>>>>> 59e7559... Clockwork cult rework: Post-merge micro-patch (#31044)
+	
 /datum/species/golem/cloth
 	name = "Cloth Golem"
 	id = "cloth golem"