From b6fd4b6bfe35a3268fd03b267bf626026920b8d7 Mon Sep 17 00:00:00 2001
From: IRONM00N <64110067+IRONM00N@users.noreply.github.com>
Date: Fri, 13 Nov 2020 18:41:01 -0500
Subject: Manual Merge bc Conflicts

---
 items/NECROMANCER_BROOCH.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'items/NECROMANCER_BROOCH.json')

diff --git a/items/NECROMANCER_BROOCH.json b/items/NECROMANCER_BROOCH.json
index d856fadd..77c09496 100644
--- a/items/NECROMANCER_BROOCH.json
+++ b/items/NECROMANCER_BROOCH.json
@@ -28,4 +28,4 @@
   "info": [
     "https://hypixel-skyblock.fandom.com/wiki/Necromancer%27s_Brooch"
   ]
-}
\ No newline at end of file
+}
-- 
cgit