From deca859284d5dd1208d00b43f1b1aae65a68940a Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 12 Sep 2017 03:00:11 -0500 Subject: [PATCH] Update atmos_alert.dm --- code/game/machinery/computer/atmos_alert.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index b433791ffd..457abb3259 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -1,4 +1,3 @@ -<<<<<<< HEAD /obj/machinery/computer/atmos_alert name = "atmospheric alert console" desc = "Used to monitor the station's air alarms."