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/Sprite
+++ b/Pro/Resources/Sprite
@@ -1,9 +1,22 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+guid: 09b550510ac4d8646b2dfa81b0bfb581
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+=======
+>>>>>>> origin/main
 guid: 512a49d95c0c4332bdd98131869c23c9
 folderAsset: yes
 timeCreated: 1441876896
 licenseType: Pro
 DefaultImporter:
+<<<<<<< HEAD
+=======
+>>>>>>> a0a675676d59d3c1e8b18f9ccca83d8e4713519c
+>>>>>>> origin/main
  userData: 
  assetBundleName: 
  assetBundleVariant: