From c37c446b25dd2cb1badca5432a53e30578225d6b Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Wed, 18 Oct 2023 14:55:59 -0400
Subject: [PATCH] submodule merge fix

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

diff --git a/assets b/assets
index 15a238b4c..61ddda8bd 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 15a238b4c59914849df282f9ce2eec5b80030207
+Subproject commit 61ddda8bd98fac65b21b4c35d24ee78129b48f29