From 09dedeb6c9d64c55999a809a91f2fc41effd471f Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Mon, 13 May 2019 22:57:31 -0400
Subject: [PATCH] Update alarm_monitor.dm

---
 .../file_system/programs/engineering/alarm_monitor.dm         | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/modular_computers/file_system/programs/engineering/alarm_monitor.dm b/code/modules/modular_computers/file_system/programs/engineering/alarm_monitor.dm
index 4a1404e562..482872b533 100644
--- a/code/modules/modular_computers/file_system/programs/engineering/alarm_monitor.dm
+++ b/code/modules/modular_computers/file_system/programs/engineering/alarm_monitor.dm
@@ -7,11 +7,7 @@
 	program_key_state = "atmos_key"
 	program_menu_icon = "alert"
 	extended_desc = "This program provides visual interface for the alarm system."
-<<<<<<< HEAD
-	required_access = access_engine	//VOREStation Addition
-=======
 	required_access = access_engine
->>>>>>> c07de0a... Merge pull request #6152 from Heroman3003/alarm-acces-restriction
 	requires_ntnet = 1
 	network_destination = "alarm monitoring network"
 	size = 5