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: 
--- a/Assets/Settings/DefaultVolumeProfile.asset.meta
+++ b/Assets/Settings/DefaultVolumeProfile.asset.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: 526aab55ceaf10142a59ee4d62fe8f42
+=======
+guid: 45dce265e34e8484d8a0ac37bbb3f593
+>>>>>>> origin/main
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 0
--- a/Assets/Settings/Mobile_RPAsset.asset.meta
+++ b/Assets/Settings/Mobile_RPAsset.asset.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: 0e9d05516516cba48aff23bd436701ca
+=======
+guid: 7a71f5fa3cfec3240876dcc0cf90945c
+>>>>>>> origin/main
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 0
--- a/Assets/Settings/Mobile_Renderer.asset.meta
+++ b/Assets/Settings/Mobile_Renderer.asset.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: e6ba5b26dda963e43beba7012129f6a5
+=======
+guid: da9ec6b53c9d2604eb3b9b733f09d25f
+>>>>>>> origin/main
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 0
--- a/Assets/Settings/PC_RPAsset.asset.meta
+++ b/Assets/Settings/PC_RPAsset.asset.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: 9c73e51f432aa184cb1408179eb09d3f
+=======
+guid: c2dd8e13cc746c643853b4d68aa29b08
+>>>>>>> origin/main
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 0
--- a/Assets/Settings/PC_Renderer.asset.meta
+++ b/Assets/Settings/PC_Renderer.asset.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: 1fe0ebf7f09ec7e4fa76e81c31b87dde
+=======
+guid: 838b2b6371a376844b3213d982530ce0
+>>>>>>> origin/main
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 0
--- a/Assets/Settings/SampleSceneProfile.asset.meta
+++ b/Assets/Settings/SampleSceneProfile.asset.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: 3dc1b9d50da01394198653f975d9c13d
+=======
+guid: 696a9922efc80544cbf9fc061955f550
+>>>>>>> origin/main
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 0
--- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset.meta
+++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: 7bfdf167f826294468ffbde02bb390f1
+=======
+guid: 800007f585dbb8d409bce87a3ccad193
+>>>>>>> origin/main
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 0