From 75144686a44fd342dd87f7be8c36227cab4b3ec5 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sun, 20 May 2018 16:38:29 -0500
Subject: [PATCH] Update permissionedit.dm

---
 code/modules/admin/permissionedit.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/modules/admin/permissionedit.dm b/code/modules/admin/permissionedit.dm
index 2bee4e70db..07d3fced54 100644
--- a/code/modules/admin/permissionedit.dm
+++ b/code/modules/admin/permissionedit.dm
@@ -195,8 +195,6 @@
 		return FALSE
 	if(use_db)
 		. = sanitizeSQL(.)
-<<<<<<< HEAD
-=======
 		//if an admin exists without a datum they won't be caught by the above
 		var/datum/DBQuery/query_admin_in_db = SSdbcore.NewQuery("SELECT 1 FROM [format_table_name("admin")] WHERE ckey = '[.]'")
 		if(!query_admin_in_db.warn_execute())
@@ -204,7 +202,6 @@
 		if(query_admin_in_db.NextRow())
 			to_chat(usr, "<span class='danger'>[.] already listed in admin database. Check the Management tab if they don't appear in the list of admins.</span>")
 			return FALSE
->>>>>>> e44298a... some dbadmin fixes (#37623)
 		var/datum/DBQuery/query_add_admin = SSdbcore.NewQuery("INSERT INTO [format_table_name("admin")] (ckey, rank) VALUES ('[.]', 'NEW ADMIN')")
 		if(!query_add_admin.warn_execute())
 			return FALSE