From 9d50222ef6dbc85db9034d3a4a4f100a1ed3ac30 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 10 Dec 2017 17:54:20 -0500 Subject: [PATCH] fixes merge conflicts --- _maps/map_files/BoxStation/BoxStation.dmm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 1f9a695a9e..295507f2b8 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -5971,15 +5971,11 @@ /area/hallway/primary/fore) "anU" = ( /obj/machinery/door/firedoor, -<<<<<<< HEAD /obj/machinery/door/poddoor/shutters/preopen{ id = "seclobby"; name = "security shutters" }, -/obj/machinery/door/airlock/glass{ -======= /obj/machinery/door/airlock/public/glass{ ->>>>>>> 09be3e9... Airlock Construction Update (#33152) name = "Courtroom" }, /turf/open/floor/plasteel/dark,