From f191548509cbac1632d87ce43ae71904b339b7f2 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Fri, 2 Dec 2022 20:38:48 -0500
Subject: [PATCH] powder that makes you say yes

---
 code/modules/admin/admin_verbs_vr.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/admin/admin_verbs_vr.dm b/code/modules/admin/admin_verbs_vr.dm
index 31194cd080..d52ff386e2 100644
--- a/code/modules/admin/admin_verbs_vr.dm
+++ b/code/modules/admin/admin_verbs_vr.dm
@@ -73,9 +73,6 @@
 			log_and_message_admins("removed a security ticket from the global list: \"[input]\"", usr)
 
 	else
-<<<<<<< HEAD
-		tgui_alert_async(usr, "The ticket list is empty.","Empty")
-=======
 		tgui_alert_async(usr, "The ticket list is empty.","Empty")
 
 /client/proc/delbook()
@@ -124,4 +121,3 @@
 
 	usr << browse(dat, "window=library")
 	onclose(usr, "library")
->>>>>>> 2c6bd88519... Merge pull request #14140 from Very-Soft/bookmanagement