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: 3f5e4c6e6f8367342893fd7030d1b4cb
+=======
+guid: 3919d291be0553e4ebdd5cb62ce994f4
+>>>>>>> origin/main
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}