merge

2025-09-10 22:34:40 +02:00
parent 12d97b494c 95297aea0c
commit eb0ba602b3
11 changed files with 128 additions and 11 deletions
--- a/export_files/theme.ogg.import
+++ b/export_files/theme.ogg.import
@@ -2,7 +2,11 @@

 importer="oggvorbisstr"
 type="AudioStreamOggVorbis"
+<<<<<<< HEAD
 uid="uid://ctwv2itux4wq8"
+=======
+uid="uid://bfyklo8ca5kji"
+>>>>>>> f50b0c1686c78e46b2924e970f95ca8aa439b973
 path="res://.godot/imported/theme.ogg-2a8b680f31de6ed20a965148078a2666.oggvorbisstr"

 [deps]