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