From 048760f2ea5ca8f3ec8985839291ab32e10105d2 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sun, 5 May 2019 14:17:53 -0400
Subject: [PATCH] Update Chemistry-Holder.dm

---
 code/modules/reagents/Chemistry-Holder.dm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm
index e8dd20a33f..467d7c37a9 100644
--- a/code/modules/reagents/Chemistry-Holder.dm
+++ b/code/modules/reagents/Chemistry-Holder.dm
@@ -88,13 +88,8 @@
 		reaction_occurred = FALSE
 		for(var/i in reagent_list)
 			var/datum/reagent/R = i
-<<<<<<< HEAD
-			if(SSchemistry.chemical_reactions_by_reagent[R.id])							//VOREStation Edit: unruntiming chems
-				eligible_reactions |= SSchemistry.chemical_reactions_by_reagent[R.id]	//VOREStation Edit: unruntiming chems
-=======
 			if(SSchemistry.chemical_reactions_by_reagent[R.id])
 				eligible_reactions |= SSchemistry.chemical_reactions_by_reagent[R.id]
->>>>>>> 2358af9... Merge pull request #6151 from Novacat/nova-runtimes
 
 		for(var/i in eligible_reactions)
 			var/datum/chemical_reaction/C = i