From 60e45814ab1973e364f22212679e6343669596be Mon Sep 17 00:00:00 2001
From: YPOQ <30683121+YPOQ@users.noreply.github.com>
Date: Sun, 22 Oct 2017 23:09:40 -0600
Subject: [PATCH] Removes golem rune code

---
 code/modules/research/xenobiology/xenobiology.dm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index b98dafdac6..0407d941bf 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -474,6 +474,7 @@
 	resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 	flags_1 = ABSTRACT_1 | NODROP_1
 
+<<<<<<< HEAD
 /obj/effect/golemrune
 	anchored = TRUE
 	desc = "A strange rune used to create golems. It glows when spirits are nearby."
@@ -542,6 +543,8 @@
 	log_admin("[key_name(G)] was made a golem by [key_name(user)].")
 	qdel(src)
 
+=======
+>>>>>>> 67f87bb... Removes golem rune code (#31990)
 /obj/item/stack/tile/bluespace
 	name = "bluespace floor tile"
 	singular_name = "floor tile"