From 41c4d0922946b2f7b090f0d5844e04eb138e9c1a Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Tue, 5 Sep 2023 03:15:14 -0500
Subject: Fix merge issues

---
 src/categories.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/categories.h')

diff --git a/src/categories.h b/src/categories.h
index a1aa92fc..1df7295b 100644
--- a/src/categories.h
+++ b/src/categories.h
@@ -224,7 +224,11 @@ private:
 
   void setParents();
 
+  static void cleanup();
+
 private:
+  static CategoryFactory* s_Instance;
+
   std::vector<Category> m_Categories;
   std::map<int, unsigned int> m_IDMap;
   std::map<int, NexusCategory> m_NexusMap;
-- 
cgit v1.3.1