From 034cf08b546a3f901beb582ffc749ff8e0ad2c5f Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Mon, 14 Jun 2021 08:20:35 -0400
Subject: [PATCH] Update supply.dm

---
 code/controllers/subsystems/supply.dm | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/code/controllers/subsystems/supply.dm b/code/controllers/subsystems/supply.dm
index 481eb66fd76..47a0e0e7bd4 100644
--- a/code/controllers/subsystems/supply.dm
+++ b/code/controllers/subsystems/supply.dm
@@ -205,19 +205,11 @@ SUBSYSTEM_DEF(supply)
 			else if(islist(SP.access) && SP.one_access)
 				var/list/L = SP.access // access var is a plain var, we need a list
 				A.req_one_access = L.Copy()
-<<<<<<< HEAD
-				A.req_access = null
-			else if(islist(SP.access) && !SP.one_access)
-				var/list/L = SP.access
-				A.req_access = L.Copy()
-				A.req_one_access = null
-=======
 				LAZYCLEARLIST(A.req_access)
 			else if(islist(SP.access) && !SP.one_access)
 				var/list/L = SP.access
 				A.req_access = L.Copy()
 				LAZYCLEARLIST(A.req_one_access)
->>>>>>> dabfdc1... Merge pull request #8122 from VOREStation/Arokha/access
 			else
 				log_debug("<span class='danger'>Supply pack with invalid access restriction [SP.access] encountered!</span>")