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