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/Settings/Build
+++ b/Assets/Settings/Build
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: bbad6d4e785a4584da7dda5f1bda30d5
+guid: 92df50b8fba934144a4c4dcaf506f9b4
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}