Update asteroid.dm

code/game/turfs/simulated/floor/plating/asteroid.dm

@@ -48,23 +48,7 @@
 			for(var/obj/item/stack/ore/O in contents)
 				O.attackby(W,user)
 				return
-
-<<<<<<< HEAD
-	if(istype(W, /obj/item/stack/tile))
-		var/obj/item/stack/tile/Z = W
-		if(!Z.use(1))
-			return
-		var/turf/open/floor/T = ChangeTurf(Z.turf_type)
-		if(istype(Z, /obj/item/stack/tile/light)) //TODO: get rid of this ugly check somehow
-			var/obj/item/stack/tile/light/L = Z
-			var/turf/open/floor/light/F = T
-			F.state = L.state
-		playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
-		return
-
-
-=======
->>>>>>> bc6eeed... Removes some duplicated code
+				
 /turf/open/floor/plating/asteroid/singularity_act()
 	if(is_planet_level(z))
 		return ..()