From 53b19470ce589873af05231ed78801a02ee943eb Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Tue, 10 Mar 2020 10:02:10 -0400
Subject: [PATCH] Update Chemistry-Reagents-Medicine.dm

---
 .../reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
index c3c1f2a052b..68085f5a99c 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
@@ -1378,8 +1378,6 @@
 	M.adjustOxyLoss(-4 * removed)
 	M.adjustToxLoss(-2 * removed)
 	M.adjustCloneLoss(-2 * removed)
-<<<<<<< HEAD
-=======
 
 /datum/reagent/menthol
 	name = "Menthol"
@@ -1391,4 +1389,3 @@
 	metabolism = REM * 0.002
 	overdose = REAGENTS_OVERDOSE * 0.25
 	scannable = 1
->>>>>>> aee62cf... Merge pull request #6797 from Cerebulon/mentholfix