resolved conflict

2026-05-17 20:17:21 +02:00
parent 8bec2f0cf8 03c0b158a4
commit 9571be257c
840 changed files with 341756 additions and 4771 deletions
--- a/Profiles/Android™.asset.meta
+++ b/Profiles/Android™.asset.meta
@@ -1,8 +1,15 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: 7f18313555a02cd48bc22d29d0f2ff55
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
+=======
+guid: f7414f44a3a063a4d80af09af6a4cc50
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+>>>>>>> origin/main
  userData: 
  assetBundleName: 
  assetBundleVariant: