From 5cd7b71fae00a18a861c730d6f19fb1d170b4da6 Mon Sep 17 00:00:00 2001 From: ArcaneMusic Date: Mon, 10 Feb 2020 16:19:26 -0500 Subject: [PATCH] Fixes merge conflict? --- _maps/map_files/Deltastation/DeltaStation2.dmm | 3 --- 1 file changed, 3 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index ce12ec47aee..039c27845f8 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -114431,7 +114431,6 @@ }, /turf/open/floor/plasteel, /area/maintenance/port) -<<<<<<< HEAD "kDh" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/neutral{ @@ -114447,7 +114446,6 @@ /obj/structure/displaycase/forsale, /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) -======= "kzm" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -114456,7 +114454,6 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel/white, /area/medical/medbay/central) ->>>>>>> upstream/master "kEN" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall,