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/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