From 5af97c3edceac5a7a86e46b34cf441c4ca7efcf2 Mon Sep 17 00:00:00 2001
From: ninjanomnom <ninjanomnom@gmail.com>
Date: Wed, 11 Apr 2018 00:42:33 -0400
Subject: [PATCH] Removes some duplicated code

---
 code/game/turfs/simulated/floor/plating/asteroid.dm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm
index 09335314c0..d37d9ee1f2 100644
--- a/code/game/turfs/simulated/floor/plating/asteroid.dm
+++ b/code/game/turfs/simulated/floor/plating/asteroid.dm
@@ -49,6 +49,7 @@
 				O.attackby(W,user)
 				return
 
+<<<<<<< HEAD
 	if(istype(W, /obj/item/stack/tile))
 		var/obj/item/stack/tile/Z = W
 		if(!Z.use(1))
@@ -62,6 +63,8 @@
 		return
 
 
+=======
+>>>>>>> bc6eeed... Removes some duplicated code
 /turf/open/floor/plating/asteroid/singularity_act()
 	if(is_planet_level(z))
 		return ..()