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/banner.png.import
+++ b/export_files/banner.png.import
@@ -2,7 +2,11 @@

 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://ogs1yl8487x0"
+=======
+uid="uid://ci8v25oyjsta7"
+>>>>>>> f50b0c1686c78e46b2924e970f95ca8aa439b973
 path="res://.godot/imported/banner.png-becbe5b95b7f582b376b39bf2d9a8088.ctex"
 metadata={
 "vram_texture": false