From 0ca050563fc5194b790e7d60ea05f17f6642abf7 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 22 Nov 2017 23:43:03 -0500 Subject: [PATCH] fixes merge conflicts --- _maps/map_files/Deltastation/DeltaStation2.dmm | 8 -------- _maps/map_files/MetaStation/MetaStation.dmm | 3 --- 2 files changed, 11 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 7ff557a16d..48c1f9fdd5 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -57608,19 +57608,11 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/loading_area, -<<<<<<< HEAD -/turf/open/floor/plasteel/neutral, -/area/teleporter) -"cmH" = ( -/obj/effect/turf_decal/loading_area, -/turf/open/floor/plasteel/neutral, -======= /turf/open/floor/plasteel, /area/teleporter) "cmH" = ( /obj/effect/turf_decal/loading_area, /turf/open/floor/plasteel, ->>>>>>> 8f164a6... Fixes deleted turfs (#33010) /area/teleporter) "cmI" = ( /obj/structure/table, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index c035ebfe1e..ac9ec2228b 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -25863,10 +25863,7 @@ forwards = 2; id = "packageSort2" }, -<<<<<<< HEAD -======= /obj/effect/turf_decal/loading_area, ->>>>>>> 8f164a6... Fixes deleted turfs (#33010) /turf/open/floor/plating, /area/quartermaster/sorting) "bbP" = (