From c9f292fd891b8e8d342e8760af9cb14459f73595 Mon Sep 17 00:00:00 2001
From: Sangelo <contact@sangelo.space>
Date: Mon, 12 Jun 2023 13:23:05 +0200
Subject: [PATCH] Refresh packwiz

---
 index.toml | 10 ----------
 pack.toml  |  6 +-----
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/index.toml b/index.toml
index f52c57e..1fe3390 100644
--- a/index.toml
+++ b/index.toml
@@ -573,11 +573,6 @@ file = "mods/lithium.pw.toml"
 hash = "77e9a02e09ec5a0d6682e5f448953048d99e36da299d92627044aff0828798e3"
 metafile = true
 
-[[files]]
-file = "mods/ma-enchants.pw.toml"
-hash = "c997694bdd2af57c008072efa0ea81747768df18bec04a88553d68e6e8b3c42d"
-metafile = true
-
 [[files]]
 file = "mods/macaws-bridges-oh-the-biomes-youll-go.pw.toml"
 hash = "4f3f6cc0a4504670b2f5cce2de9b162c575cb0719eb406af06d1e5948d9bef93"
@@ -598,11 +593,6 @@ file = "mods/macaws-fences-and-walls.pw.toml"
 hash = "b16dd6d03444954164f412bdbbf33c23e88a28daf83fa4628027c6b3e167107a"
 metafile = true
 
-[[files]]
-file = "mods/macaws-furniture.pw.toml"
-hash = "d0674dbe5d5d5661f8746475cb28439e580e61f9fc0ea7f42c6c5a58c77d655f"
-metafile = true
-
 [[files]]
 file = "mods/macaws-paintings.pw.toml"
 hash = "f2b787b718283a97f997fb0138a04a790bedf65f6d7edfd30728da9dda692e5a"
diff --git a/pack.toml b/pack.toml
index 6cf9700..eb8578b 100644
--- a/pack.toml
+++ b/pack.toml
@@ -6,11 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-<<<<<<< HEAD
-hash = "c8873e342613020ec049d150df6060c5c773ace52f471cc0a3974de88ca1056a"
-=======
-hash = "9ef64aa857fcb7112bdd7c710ef53f1dedb8d6bc4270d59560f6c0e49e887fdb"
->>>>>>> dev
+hash = "3726120624e0a2ee566c9702df751c983d58aee60ebef173e9acdc2d58a81186"
 
 [versions]
 minecraft = "1.19.2"