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

---
 .../modular_computers/file_system/programs/generic/camera.dm  | 4 ----
 1 file changed, 4 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 a83d9c2175..15c7868737 100644
--- a/code/modules/modular_computers/file_system/programs/generic/camera.dm
+++ b/code/modules/modular_computers/file_system/programs/generic/camera.dm
@@ -72,11 +72,7 @@
 	if(!network_access)
 		return 1
 
-<<<<<<< HEAD
-	return check_access(user, access_security) || check_access(user, access_heads) || check_access(user, network_access)	//VOREStation Edit
-=======
 	return check_access(user, access_security) || check_access(user, access_heads) || check_access(user, network_access)
->>>>>>> 1232e68... Merge pull request #6153 from Heroman3003/camera-access-changes
 
 /datum/nano_module/camera_monitor/Topic(href, href_list)
 	if(..())