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/Materials.meta
+++ b/Assets/Materials.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3107737185c186849a570faa7cc4e450
+guid: 2230bf768ecb84610af77bea6cdd7074
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}