From fe5f1eb6ea5b88e9186d448f814204df81845a31 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Thu, 6 Jun 2024 17:11:30 -0400
Subject: [PATCH] Fix merge conflict

---
 assets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets b/assets
index ecedb373c..898e94729 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit ecedb373ce7a4a6bac0026253813da7363743ca0
+Subproject commit 898e94729aa2f0ad4179d6f66dd075070c3172dc