From 352fe555f29eaec1fbe33dede7058f6465b2d55e Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Thu, 28 Mar 2019 16:33:29 -0400
Subject: [PATCH] Update structures.dm

---
 code/modules/multiz/structures.dm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/code/modules/multiz/structures.dm b/code/modules/multiz/structures.dm
index 0fd93d1132..6abc33d56c 100644
--- a/code/modules/multiz/structures.dm
+++ b/code/modules/multiz/structures.dm
@@ -130,11 +130,7 @@
 	density = 0
 	opacity = 0
 	anchored = 1
-<<<<<<< HEAD
-	layer = 2.4 // Above turf, but they're sort of the floor, so below objects.
-=======
 	flags = ON_BORDER
->>>>>>> ca2dab5... Merge pull request #5924 from Atermonera/stairway_to_heaven
 
 /obj/structure/stairs/initialize()
 	. = ..()
@@ -186,4 +182,4 @@
 
 /obj/structure/stairs/west
 	dir = WEST
-	bound_width = 64
\ No newline at end of file
+	bound_width = 64