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/GREAT_WHITE_SHARK_TOOTH.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'items/GREAT_WHITE_SHARK_TOOTH.json')

diff --git a/items/GREAT_WHITE_SHARK_TOOTH.json b/items/GREAT_WHITE_SHARK_TOOTH.json
index d6e4e7b0..f3f0aeec 100644
--- a/items/GREAT_WHITE_SHARK_TOOTH.json
+++ b/items/GREAT_WHITE_SHARK_TOOTH.json
@@ -19,4 +19,4 @@
   "info": [
     "https://hypixel-skyblock.fandom.com/wiki/Great_White_Shark_Tooth"
   ]
-}
\ No newline at end of file
+}
-- 
cgit