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.meta
+++ b/Assets/Settings.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3c41f51487bbe394b9b8568d1b254bd4
+guid: 148cdcfbaffe4a24b85ef92b75ce4ff7
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}