From 208f5fd592e5d14d3ee8a462c5a16a2d60e08921 Mon Sep 17 00:00:00 2001
From: Furlucis <Logman115@gmail.com>
Date: Fri, 17 Jan 2014 02:57:47 -0500
Subject: [PATCH] Removes the second holywater

Deletes the second kind of holy water that doesn't do anything. Lemme
know if I should do the opposite of this.

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
---
 code/modules/reagents/Chemistry-Reagents.dm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index 3ae689f97c7..ad08e23e31d 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -1931,6 +1931,7 @@ datum
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+<<<<<<< HEAD
 		holywater
 			name = "Holy Water"
 			id = "holywater"
@@ -1938,6 +1939,8 @@ datum
 			reagent_state = LIQUID
 			color = "#535E66" // rgb: 83, 94, 102
 
+=======
+>>>>>>> 5268e4f... Removes the second holywater
 		nanites
 			name = "Nanomachines"
 			id = "nanites"