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/GOLEM_POPPY.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'items/GOLEM_POPPY.json')

diff --git a/items/GOLEM_POPPY.json b/items/GOLEM_POPPY.json
index 767ed5c7..ec373aca 100644
--- a/items/GOLEM_POPPY.json
+++ b/items/GOLEM_POPPY.json
@@ -13,5 +13,10 @@
   ],
   "internalname": "GOLEM_POPPY",
   "clickcommand": "",
-  "modver": "1.3-REL"
+  "modver": "1.5-REL",
+  "crafttext": "",
+  "infoType": "WIKI_URL",
+  "info": [
+    "https://hypixel-skyblock.fandom.com/wiki/Ancient_Rose"
+  ]
 }
\ No newline at end of file
-- 
cgit