From b50ccfa0806d772458fc7a8306fc4e4381b6b555 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Tue, 10 Oct 2023 22:36:58 -0400
Subject: [PATCH] Resolve merge conflicts

---
 art    | 2 +-
 assets | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/art b/art
index 1656bea53..d1aa2c6e8 160000
--- a/art
+++ b/art
@@ -1 +1 @@
-Subproject commit 1656bea5370c65879aaeb323e329f403c78071c5
+Subproject commit d1aa2c6e81c0ddff8af3d6aac4700590cc5b0ef4
diff --git a/assets b/assets
index ddc9c55a6..2f49d8439 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit ddc9c55a6c898dc6747dfc5a80295a6dc26e653c
+Subproject commit 2f49d84392bce6e5e6f1396ac6da5c5d5ab28395