fixes map conflicts

2017-12-10 18:12:33 -05:00
parent 1cc3e865bf
commit 4b8c3f808e
2 changed files with 0 additions and 25 deletions
@@ -104797,23 +104797,17 @@
 /turf/open/floor/plasteel/red/side{
 	dir = 8
 	},
-<<<<<<< HEAD
 /area/security/brig)
 "ehv" = (
 /obj/machinery/vending/kink,
 /turf/open/floor/plating,
 /area/crew_quarters/abandoned_gambling_den)
-=======
-/obj/effect/turf_decal/caution/stand_clear,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit/departure_lounge)
 "ehP" = (
 /obj/machinery/computer/security/telescreen/entertainment{
 	pixel_y = -32
 	},
 /turf/open/floor/plasteel/dark,
 /area/library)
->>>>>>> dd67e1e...  Good Clean Fun: A vending machine for games! (#33265)

 (1,1,1) = {"
 aaa
@@ -51321,29 +51321,10 @@
 	},
 /turf/open/floor/plating/airless,
 /area/maintenance/department/chapel/monastery)
-<<<<<<< HEAD
-=======
-"cCS" = (
-/obj/machinery/rnd/protolathe/department/security,
-/turf/open/floor/plasteel/dark,
-/area/security/main)
-"cCT" = (
-/obj/machinery/rnd/protolathe/department/cargo,
-/turf/open/floor/plasteel,
-/area/quartermaster/storage)
-"cCU" = (
-/obj/machinery/rnd/circuit_imprinter,
-/turf/open/floor/plasteel,
-/area/engine/engineering)
-"cCV" = (
-/obj/machinery/rnd/protolathe/department/engineering,
-/turf/open/floor/plasteel,
-/area/engine/engineering)
 "cCW" = (
 /obj/machinery/vending/games,
 /turf/open/floor/plasteel/dark,
 /area/library)
->>>>>>> dd67e1e...  Good Clean Fun: A vending machine for games! (#33265)

 (1,1,1) = {"
 aaa