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

---
 code/modules/library/lib_machines.dm | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm
index b18ed0ff92..593e5f72cf 100644
--- a/code/modules/library/lib_machines.dm
+++ b/code/modules/library/lib_machines.dm
@@ -492,22 +492,7 @@
 				B.item_state = B.icon_state
 				src.visible_message("[src]'s printer hums as it produces a completely bound book. How did it do that?")
 				break
-<<<<<<< HEAD
 			qdel(query) //CHOMPEdit TGSQL
-=======
-
-	if(href_list["delid"])
-		if(!check_rights(R_ADMIN))
-			return
-		var/sqlid = sanitizeSQL(href_list["delid"])
-		establish_old_db_connection()
-		if(!dbcon_old.IsConnected())
-			tgui_alert_async(usr, "Connection to Archive has been severed. Aborting.")
-		else
-			var/DBQuery/query = dbcon_old.NewQuery("DELETE FROM library WHERE id=[sqlid]")
-			query.Execute()
-			log_admin("[usr.key] has deleted the book [sqlid]")	//VOREStation Addition
->>>>>>> 2c6bd88519... Merge pull request #14140 from Very-Soft/bookmanagement
 
 	if(href_list["orderbyid"])
 		var/orderid = tgui_input_number(usr, "Enter your order:")