conflict partially resolved

2026-05-17 11:31:00 +02:00
parent ab6263cb10
commit 023bddc91b
9 changed files with 1276 additions and 236 deletions
--- a/Assets/MainScreenUI.meta
+++ b/Assets/MainScreenUI.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9f4c3c97db77f7847a963acfa80db83b
+guid: 1bc3c07f160332843b2a60af3513f7f6
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}