fixed everythıng no crashes

2026-06-07 02:13:36 +02:00
parent 62f9247b19
commit e2d2010c42
3 changed files with 6 additions and 145 deletions
@@ -119,6 +119,7 @@ NavMeshSettings:
    debug:
      m_Flags: 0
  m_NavMeshData: {fileID: 0}
+<<<<<<< HEAD
 --- !u!1 &330371564
 GameObject:
  m_ObjectHideFlags: 0
@@ -354,6 +355,8 @@ Transform:
  m_Children: []
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+=======
+>>>>>>> parent of 8849a17 (soundeffects)
 --- !u!1 &1410446868
 GameObject:
  m_ObjectHideFlags: 0
@@ -565,6 +568,9 @@ SceneRoots:
  m_ObjectHideFlags: 0
  m_Roots:
  - {fileID: 1410446871}
+<<<<<<< HEAD
  - {fileID: 995945558}
  - {fileID: 330371566}
  - {fileID: 2033681219}
+=======
+>>>>>>> parent of 8849a17 (soundeffects)