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

(limited to 'items/INFLATABLE_JERRY.json')

diff --git a/items/INFLATABLE_JERRY.json b/items/INFLATABLE_JERRY.json
index cbffe58d..23a34c2f 100644
--- a/items/INFLATABLE_JERRY.json
+++ b/items/INFLATABLE_JERRY.json
@@ -20,4 +20,4 @@
   "info": [
     "https://hypixel-skyblock.fandom.com/wiki/Inflatable_Jerry"
   ]
-}
\ No newline at end of file
+}
-- 
cgit