From 7541463e0109fb8313c514477b104dd929a1f7f3 Mon Sep 17 00:00:00 2001
From: Ccomp5950 <Ccomp5950@gmail.com>
Date: Wed, 15 Jan 2014 17:33:13 -0600
Subject: [PATCH] Moved Supermatter.dm out of the WorkInProgress directory.

Conflicts:
	baystation12.dme
---
 baystation12.dme                                       |  2 +-
 code/modules/reagents/Chemistry-Reagents.dm            | 10 ----------
 .../supermatter/supermatter.dm}                        |  0
 3 files changed, 1 insertion(+), 11 deletions(-)
 rename code/{WorkInProgress/Yinadele/Supermatter.dm => modules/supermatter/supermatter.dm} (100%)

diff --git a/baystation12.dme b/baystation12.dme
index ed72c127bf1..c56eb52e88b 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -1342,6 +1342,7 @@
 #include "code\modules\security levels\security levels.dm"
 #include "code\modules\store\items.dm"
 #include "code\modules\store\store.dm"
+#include "code\modules\supermatter\supermatter.dm"
 #include "code\modules\surgery\appendix.dm"
 #include "code\modules\surgery\bones.dm"
 #include "code\modules\surgery\braincore.dm"
@@ -1444,7 +1445,6 @@
 #include "code\WorkInProgress\Sayu\random_items.dm"
 #include "code\WorkInProgress\SkyMarshal\officer_stuff.dm"
 #include "code\WorkInProgress\SkyMarshal\Ultralight_procs.dm"
-#include "code\WorkInProgress\Yinadele\Supermatter.dm"
 #include "code\WorkInProgress\ZomgPonies\Colored-windows.dm"
 #include "code\WorkInProgress\ZomgPonies\karma.dm"
 #include "code\WorkInProgress\ZomgPonies\clothing\civilian.dm"
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index ad08e23e31d..4503c358320 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -1931,16 +1931,6 @@ datum
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-<<<<<<< HEAD
-		holywater
-			name = "Holy Water"
-			id = "holywater"
-			description = "A ubiquitous chemical substance that is composed of hydrogen and oxygen."
-			reagent_state = LIQUID
-			color = "#535E66" // rgb: 83, 94, 102
-
-=======
->>>>>>> 5268e4f... Removes the second holywater
 		nanites
 			name = "Nanomachines"
 			id = "nanites"
diff --git a/code/WorkInProgress/Yinadele/Supermatter.dm b/code/modules/supermatter/supermatter.dm
similarity index 100%
rename from code/WorkInProgress/Yinadele/Supermatter.dm
rename to code/modules/supermatter/supermatter.dm