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/TutorialInfo/Icons.meta
+++ b/Assets/TutorialInfo/Icons.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: d8c6f31643437cf4fa0e66ec2ff9a2e2
+=======
 guid: c5ada28132037dc49b25799cd085863a
+>>>>>>> origin/main
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}