From 4d61ea105d0d4f0ee1fa875f4b7bda29555a31b0 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Thu, 14 Dec 2017 14:33:17 -0500
Subject: [PATCH] Update holder2.dm

---
 code/modules/admin/holder2.dm | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm
index 4ba5dc37f3..e9d4462c0a 100644
--- a/code/modules/admin/holder2.dm
+++ b/code/modules/admin/holder2.dm
@@ -149,13 +149,6 @@ you will have to do something like if(client.rights & R_ADMIN) yourself.
 
 //This proc checks whether subject has at least ONE of the rights specified in rights_required.
 /proc/check_rights_for(client/subject, rights_required)
-<<<<<<< HEAD
-	if(subject && subject.holder && subject.holder.rank)
-		if(rights_required && !(rights_required & subject.holder.rank.rights))
-			return 0
-		return 1
-	return 0
-=======
 	if(subject && subject.holder)
 		return subject.holder.check_for_rights(rights_required)
 	return 0
@@ -181,4 +174,3 @@ you will have to do something like if(client.rights & R_ADMIN) yourself.
 
 /proc/HrefTokenFormField(forceGlobal = FALSE)
 	return "<input type='hidden' name='admin_token' value='[RawHrefToken(forceGlobal)]'>"
->>>>>>> 4e929c7... Deadmin tweaks: Admins without +AUTOLOGIN start deadmined. AUTOLOGIN defaults to on. (#33480)