From 8970cb433e3538846844a9c6b0c30f3ec9b72384 Mon Sep 17 00:00:00 2001
From: ZeroMan <cookiesvvww@gmail.com>
Date: Sat, 14 Mar 2020 16:39:59 -0400
Subject: [PATCH] i really hate life

---
 _maps/map_files/BoxStation/BoxStation.dmm | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index f677a877a6..37bb2127bd 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -59571,23 +59571,10 @@
 	},
 /turf/closed/wall/r_wall,
 /area/maintenance/disposal/incinerator)
-<<<<<<< HEAD
-=======
 "wHT" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
 /turf/open/floor/plating,
 /area/maintenance/starboard/fore)
-"wIG" = (
-/obj/effect/turf_decal/tile/red{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/red,
-/turf/open/floor/plasteel,
-/area/security/brig)
->>>>>>> cda2ace252871b0904c5d36f3d7da23ceb4bf152
 "wKe" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/door/poddoor/shutters/preopen{