From 439723caffeb016f9cb50b669fec67c8441bf60e Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sun, 12 Nov 2017 11:18:11 -0600
Subject: [PATCH] Update adminhelp.dm

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

diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index 980e0cf1a0..f178eb08bd 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -248,13 +248,8 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 //private
 /datum/admin_help/proc/TicketHref(msg, ref_src, action = "ticket")
 	if(!ref_src)
-<<<<<<< HEAD
-		ref_src = "\ref[src]"
-	return "<A HREF='?_src_=holder;[HrefToken()];ahelp=[ref_src];ahelp_action=[action]'>[msg]</A>"
-=======
 		ref_src = "[REF(src)]"
 	return "<A HREF='?_src_=holder;[HrefToken(TRUE)];ahelp=[ref_src];ahelp_action=[action]'>[msg]</A>"
->>>>>>> 626302c... Merge pull request #32161 from ninjanomnom/512-experimental
 
 //message from the initiator without a target, all admins will see this
 //won't bug irc