resolved conflict

2026-05-17 20:17:21 +02:00
parent 8bec2f0cf8 03c0b158a4
commit 9571be257c
840 changed files with 341756 additions and 4771 deletions
--- a/Assets/Materials.meta
+++ b/Assets/Materials.meta
@@ -1,8 +1,16 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: 2230bf768ecb84610af77bea6cdd7074
+=======
+guid: 6b37670de43269e4f984694475e75510
+>>>>>>> origin/main
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
+<<<<<<< HEAD
  assetBundleVariant: 
+=======
+  assetBundleVariant: 
+>>>>>>> origin/main