From 408b0f366da29bbfad48cca023fe1bf1ff40e1d6 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Tue, 25 May 2021 23:25:28 -0400
Subject: [PATCH] Update spreading.dm

---
 code/modules/hydroponics/spreading/spreading.dm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm
index ca99d733a5..73d93abe55 100644
--- a/code/modules/hydroponics/spreading/spreading.dm
+++ b/code/modules/hydroponics/spreading/spreading.dm
@@ -74,13 +74,8 @@
 /obj/effect/plant/Destroy()
 	neighbors.Cut()
 	if(seed.get_trait(TRAIT_SPREAD)==2)
-<<<<<<< HEAD
-		unsense_proximity(callback = .HasProximity, center = get_turf(src))
-	SSplants.remove_plant(src)
-=======
 		unsense_proximity(callback = /atom/proc/HasProximity, center = get_turf(src))
-	plant_controller.remove_plant(src)
->>>>>>> fdabe51... Linter Introduction + Cleanup (#8085)
+	SSplants.remove_plant(src)
 	for(var/obj/effect/plant/neighbor in range(1,src))
 		SSplants.add_plant(neighbor)
 	return ..()