Some conflicts resolved

2026-05-27 21:32:22 +02:00
parent 2d7b5481c0 e96ce2de20
commit 13f62000b3
909 changed files with 290753 additions and 12158 deletions
--- a/Assets/minigame/dekorace
+++ b/Assets/minigame/dekorace
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: 8b02f5e5a2bd2df479219d58104b58e4
+=======
+guid: ada29dc2a8f88f34fbe9db1f0ec749af
+>>>>>>> origin/main
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}