Conflict resolve

2026-05-17 11:25:21 +02:00
parent f800e78f14
commit c8d8b6b802
6 changed files with 798 additions and 126 deletions
--- a/Assets/Materials.meta
+++ b/Assets/Materials.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 579723ff3377eaf4a9e50b2d20bbb490
+guid: 2230bf768ecb84610af77bea6cdd7074
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}