Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone

# Conflicts:
#	Assets/Prefabs/AR.prefab
#	Assets/Prefabs/Pistole.prefab

Assets/Prefabs/AR.prefab

@@ -647,7 +647,11 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5850548977863442861}
   serializedVersion: 2
+<<<<<<< HEAD
   m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
+=======
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+>>>>>>> f9295a93aa1ad4e11e0c2aca217f299e8ab071be
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1.2828, y: 3.615999, z: 1.2828}
   m_ConstrainProportionsScale: 0
@@ -657,7 +661,7 @@ Transform:
   - {fileID: 9091445594414695264}
   - {fileID: 7448449092846401218}
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &8402877828330663370
 MeshFilter:
   m_ObjectHideFlags: 0