From 59b873137001ffa8bdc01d9d9b809ef9f0475004 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Sun, 26 Nov 2017 21:20:54 -0500
Subject: [PATCH] Update misc.dm

---
 code/__DEFINES/misc.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
index 1782c7aa62..7cc2e4537f 100644
--- a/code/__DEFINES/misc.dm
+++ b/code/__DEFINES/misc.dm
@@ -478,12 +478,8 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
 
 #define SYRINGE_DRAW 0
 #define SYRINGE_INJECT 1
-<<<<<<< HEAD
-=======
-#define RESEARCH_MATERIAL_RECLAMATION_ID "0"
 
 //gold slime core spawning
 #define NO_SPAWN 0
 #define HOSTILE_SPAWN 1
 #define FRIENDLY_SPAWN 2
->>>>>>> 2abae67... Cleans up goldcore defines (#33090)