From 45240e586bfa9577a66c5c8ccc50512c7abfd22f Mon Sep 17 00:00:00 2001
From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date: Wed, 4 Jan 2023 07:33:04 +1000
Subject: [PATCH] Conflict resolution 2

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

diff --git a/code/modules/hydroponics/spreading/spreading_growth.dm b/code/modules/hydroponics/spreading/spreading_growth.dm
index de32831152d..3a037fc7974 100644
--- a/code/modules/hydroponics/spreading/spreading_growth.dm
+++ b/code/modules/hydroponics/spreading/spreading_growth.dm
@@ -132,15 +132,9 @@
 			return
 
 		//move out to the destination
-<<<<<<< HEAD
 		child.anchored = FALSE
-		step_to(child, target_turf)
-		child.anchored = TRUE
-=======
-		child.anchored = 0
 		child.Move(target_turf)	// Do a normal move, so we can cross and uncross things we need to. Stairs, Open space "falling", etc.
-		child.anchored = 1
->>>>>>> 29f3be1872a... Maintenance on Hydro code, specifically vines and bees. (#8851)
+		child.anchored = TRUE
 		child.update_icon()
 
 		//see if anything is there