From 496a34ab2b0c093b129085b155067bf205e41da0 Mon Sep 17 00:00:00 2001
From: Aronai Sieyes <arokha@arokha.com>
Date: Fri, 3 Apr 2020 12:24:58 -0400
Subject: [PATCH] Update grown.dm

---
 code/modules/hydroponics/grown.dm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index c31676611c4..982f44e7946 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -13,15 +13,10 @@
 	var/datum/seed/seed
 	var/potency = -1
 
-<<<<<<< HEAD
-/obj/item/weapon/reagent_containers/food/snacks/grown/Initialize(newloc,planttype)
 
-	..()
-=======
 /obj/item/weapon/reagent_containers/food/snacks/grown/Initialize(var/mapload, var/planttype)
 	. = ..()
 	
->>>>>>> 3473522... Merge pull request #6904 from VOREStation/pol-cleanup
 	if(!dried_type)
 		dried_type = type