From b7761ee3efd36a6164281b3713cf288223400ef8 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Mon, 6 May 2019 14:18:39 -0400
Subject: [PATCH] Update Chemistry-Recipes.dm

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

diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index 736c5944cf..7d2a588d52 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -2378,10 +2378,7 @@
 	id = "biomass"
 	result = "biomass"
 	required_reagents = list("protein" = 1, "sugar" = 1, "phoron" = 1)
-<<<<<<< HEAD
 	result_amount = 6	// Roughly 120u per phoron sheet //VOREStation Edit
-=======
-	result_amount = 1	// Roughly 20u per phoron sheet
 
 // Neutralization.
 
@@ -2391,4 +2388,3 @@
 	result = "protein"
 	required_reagents = list("anti_toxin" = 1, "neurotoxic_protein" = 2)
 	result_amount = 2
->>>>>>> a033ac4... Merge pull request #6113 from Mechoid/FishingFtWorldServer