resolving conflict

2026-05-17 20:15:06 +02:00
parent d7211e62de 28a81b6014
commit b0945c9bdb
771 changed files with 276633 additions and 10431 deletions
--- a/Pro/Resources.meta
+++ b/Pro/Resources.meta
@@ -1,5 +1,13 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: 243e06394e614e5d99fab26083b707fa
+=======
+<<<<<<< HEAD
+guid: 60241e4e453157b4c928f3503a41f642
+=======
+guid: 243e06394e614e5d99fab26083b707fa
+>>>>>>> a0a675676d59d3c1e8b18f9ccca83d8e4713519c
+>>>>>>> origin/main
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}