conflict resolve

2026-05-17 12:32:20 +02:00
parent 9a99405f4b
commit 8bec2f0cf8
12 changed files with 35 additions and 52 deletions
--- a/Assets/GameManager.meta
+++ b/Assets/GameManager.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 74c99196e7d046a4497d6aa5ba358650
+guid: bbd26b895bc2b894b8989c08d9fd9197
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}