Update beebox.dm

2017-12-17 17:37:53 -06:00
parent fcceb5ec77
commit 8d6d561950
1 changed files with 0 additions and 5 deletions
@@ -257,10 +257,5 @@
 			B.forceMove(drop_location())
 	for(var/obj/item/honey_frame/HF in honey_frames)
 		if(HF.loc == src)
-<<<<<<< HEAD
-			HF.loc = get_turf(src)
-	qdel(src)
-=======
 			HF.forceMove(drop_location())
 	qdel(src)
->>>>>>> 5233ec1... Finishes the forceMove port (#33519)