From aeee2fd56dccedcbdc454c4e5e33e54cb7a36b09 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Tue, 21 Jan 2020 01:10:34 -0500
Subject: [PATCH] Update admin_secrets.dm

---
 code/modules/admin/admin_secrets.dm | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/code/modules/admin/admin_secrets.dm b/code/modules/admin/admin_secrets.dm
index e3085293d5..22430f17a3 100644
--- a/code/modules/admin/admin_secrets.dm
+++ b/code/modules/admin/admin_secrets.dm
@@ -28,14 +28,7 @@ var/datum/admin_secrets/admin_secrets = new()
 /datum/admin_secret_category
 	var/name = ""
 	var/desc = ""
-<<<<<<< HEAD
-	var/list/datum/admin_secret_item/items
-
-/datum/admin_secret_category
-	items = list()
-=======
 	var/list/datum/admin_secret_item/items = list()
->>>>>>> 9684db1... Merge pull request #6636 from SpaceManiac/patch/syntax
 
 /datum/admin_secret_category/proc/can_view(var/mob/user)
 	for(var/datum/admin_secret_item/item in items)