From fcff9205e6b693a5ea39b58f104f93bab786970e Mon Sep 17 00:00:00 2001
From: Spades <SpadesNeil@users.noreply.github.com>
Date: Sun, 13 Jan 2019 12:27:21 -0500
Subject: [PATCH] Eliminates vorestation edit

---
 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 49955b68f9..a6e50cb108 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -343,13 +343,8 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 		return
 
 	var/msg = "<font color='red' size='4'><b>- AdminHelp marked as IC issue! -</b></font><br>"
-<<<<<<< HEAD
-	msg += "<font color='red'><b>This is something that can be solved ICly, and does not currently require admin intervention.</b></font><br>"  //VOREStation Edit
-	msg += "<font color='red'>Your AdminHelp may also be unable to be answered due to ongoing events.</font>"  //VOREStation Edit
-=======
 	msg += "<font color='red'><b>This is something that can be solved ICly, and does not currently require staff intervention.</b></font><br>"
 	msg += "<font color='red'>Your AdminHelp may also be unanswerable due to ongoing events.</font>"
->>>>>>> ece6992... Merge pull request #5820 from Anewbe/ic_issue_response
 
 	if(initiator)
 		to_chat(initiator, msg)