From d95b7fda42b708280e051c84149ce28273d86bf2 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Mon, 13 May 2019 22:56:41 -0400
Subject: [PATCH] Update camera.dm

---
 .../file_system/programs/generic/camera.dm        | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/code/modules/modular_computers/file_system/programs/generic/camera.dm b/code/modules/modular_computers/file_system/programs/generic/camera.dm
index b719f86475..a83d9c2175 100644
--- a/code/modules/modular_computers/file_system/programs/generic/camera.dm
+++ b/code/modules/modular_computers/file_system/programs/generic/camera.dm
@@ -9,23 +9,8 @@
 	switch(network)
 		if(NETWORK_THUNDER)
 			return 0
-<<<<<<< HEAD
-		if(NETWORK_ENGINE,NETWORK_ALARM_ATMOS,NETWORK_ALARM_FIRE,NETWORK_ALARM_POWER)		//VOREStation Edit
-			return access_engine
-		/*
-		if(NETWORK_MEDICAL)
-			return access_medical
-		if(NETWORK_RESEARCH,NETWORK_RESEARCH_OUTPOST)
-			return access_research
-		if(NETWORK_MINE,NETWORK_CARGO )
-			return access_mailsorting // Cargo office - all cargo staff should have access here.
-		if(NETWORK_COMMAND,NETWORK_TELECOM)
-			return access_heads
-		*/		//VOREStation Removal
-=======
 		if(NETWORK_ENGINE,NETWORK_ALARM_ATMOS,NETWORK_ALARM_FIRE,NETWORK_ALARM_POWER)
 			return access_engine
->>>>>>> 1232e68... Merge pull request #6153 from Heroman3003/camera-access-changes
 		if(NETWORK_ERT)
 			return access_cent_specops