Update atmos_alert.dm

2017-09-12 03:00:11 -05:00
parent 505925d767
commit deca859284
1 changed files with 0 additions and 1 deletions
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 /obj/machinery/computer/atmos_alert
 	name = "atmospheric alert console"
 	desc = "Used to monitor the station's air alarms."