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