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/Style
+++ b/Pro/Resources/Style
@@ -1,9 +1,22 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+guid: 8804c70a74c3d9141be28f4881fc1ce2
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+=======
+>>>>>>> origin/main
 guid: 4aecb92fff08436c8303b10eab8da368
 folderAsset: yes
 timeCreated: 1441876950
 licenseType: Pro
 DefaultImporter:
+<<<<<<< HEAD
+=======
+>>>>>>> a0a675676d59d3c1e8b18f9ccca83d8e4713519c
+>>>>>>> origin/main
  userData: 
  assetBundleName: 
  assetBundleVariant: