Eda minigame but new branch

2026-05-17 20:44:46 +02:00
parent dfec8df767
commit a15a9790b5
58 changed files with 1594 additions and 15 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: 
-  assetBundleVariant: 
+<<<<<<< HEAD
+  assetBundleVariant: 
+=======
+  assetBundleVariant: 
+>>>>>>> origin/main