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/Settings/DefaultVolumeProfile.asset.meta
+++ b/Assets/Settings/DefaultVolumeProfile.asset.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: 526aab55ceaf10142a59ee4d62fe8f42
+=======
 guid: 45dce265e34e8484d8a0ac37bbb3f593
+>>>>>>> origin/main
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 0