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/PIGMAN;3.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'items/PIGMAN;3.json')

diff --git a/items/PIGMAN;3.json b/items/PIGMAN;3.json
index 83912369..f8121a2b 100644
--- a/items/PIGMAN;3.json
+++ b/items/PIGMAN;3.json
@@ -6,6 +6,7 @@
   "lore": [
     "§8Combat Pet",
     "",
+    "§7Ferocity: §a{FEROCITY}",
     "§7Strength: §a{STRENGTH}",
     "§7Defense: §a{DEFENSE}",
     "",
@@ -43,4 +44,4 @@
   "info": [
     "https://hypixel-skyblock.fandom.com/wiki/Pigman_Pet"
   ]
-}
\ No newline at end of file
+}
-- 
cgit