From 3041c872b40aa01e1df2f1255e0e507c33553ad2 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Mon, 7 Nov 2022 17:33:47 -0500
Subject: [PATCH] powder that makes you say yes

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

diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index 2718ab2e17..77ab40adc1 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -239,17 +239,10 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 /datum/admin_help/proc/FullMonty(ref_src)
 	if(!ref_src)
 		ref_src = "\ref[src]"
-<<<<<<< HEAD
-	if(initiator && initiator.mob) //CHOMPEdit Start
-		. = ADMIN_FULLMONTY_NONAME(initiator.mob)
-	else
-		. = "Initiator disconnected." //CHOMPEdit End
-=======
 	if(initiator && initiator.mob)
 		. = ADMIN_FULLMONTY_NONAME(initiator.mob)
 	else
 		. = "Initiator disconnected."
->>>>>>> 318629da8e... Merge pull request #14037 from ItsSelis/patch-6
 	if(state == AHELP_ACTIVE)
 		. += ClosureLinks(ref_src)