Update misc.dm

2017-11-26 21:20:54 -05:00
parent 4a22fed89d
commit 59b8731370
1 changed files with 0 additions and 4 deletions
@@ -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)