From 858f1dc07acd2d1e741a4b8bf1bb185ec4e82f20 Mon Sep 17 00:00:00 2001
From: Chris Miles <akkadius1@gmail.com>
Date: Wed, 25 Jun 2025 14:18:44 -0500
Subject: [PATCH] Update worldserver.cpp

---
 queryserv/worldserver.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/queryserv/worldserver.cpp b/queryserv/worldserver.cpp
index ef75740e7..955169871 100644
--- a/queryserv/worldserver.cpp
+++ b/queryserv/worldserver.cpp
@@ -26,11 +26,7 @@
 extern WorldServer           worldserver;
 extern const queryservconfig *Config;
 extern QSDatabase            qs_database;
-<<<<<<< kinglykrab/lfguildmanager-global-to-singleton
-=======
-extern LFGuildManager        lfguildmanager;
 extern ZSList                zs_list;
->>>>>>> master
 
 WorldServer::WorldServer()
 {