fixes merge conflicts

2017-11-22 23:43:03 -05:00
parent 1b094a4374
commit 0ca050563f
2 changed files with 0 additions and 11 deletions
@@ -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,
@@ -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" = (