update modules + assets merge

2023-11-09 06:28:50 -05:00
parent d9a31d8ab8
commit f8ec09b7c2
2 changed files with 4 additions and 1 deletions
@@ -2,6 +2,9 @@
 	path = assets
 	url = https://github.com/FunkinCrew/Funkin-history-rewrite-assets
 	branch = master
+	update = merge
 [submodule "art"]
 	path = art
 	url = https://github.com/FunkinCrew/Funkin-history-rewrite-art
+	branch = master
+	update = merge