Revert "fix1.2"

This reverts commit c35a879034.

Assets/Scripts/Bullet.cs

@@ -33,9 +33,6 @@ public class Bullet : MonoBehaviour
                 Destroy(gameObject);
             }
 
-<<<<<<< HEAD
->>>>>>> parent of 392d236 (Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone)
-=======
 >>>>>>> parent of 392d236 (Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone)
         }
         else if(collision.gameObject.tag == "Wall")

Assets/Scripts/Shoot.cs

@@ -11,12 +11,7 @@ public class Shoot : MonoBehaviour
     void Start()
     {
 <<<<<<< HEAD
-<<<<<<< HEAD
         
-=======
-        if (weapon == null)
-            weapon = FindFirstObjectByType<WeaponReload>();
->>>>>>> parent of 392d236 (Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone)
 =======
         if (weapon == null)
             weapon = FindFirstObjectByType<WeaponReload>();
@@ -25,7 +20,6 @@ public class Shoot : MonoBehaviour
 
     void Update()
     {
-<<<<<<< HEAD
 <<<<<<< HEAD
         
         if ( AR == true && Input.GetKey(KeyCode.Mouse0))
@@ -34,11 +28,6 @@ public class Shoot : MonoBehaviour
         
         if (AR == true && Input.GetKey(KeyCode.Mouse0) && Time.time >= nextShotTime)
 >>>>>>> parent of 392d236 (Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone)
-=======
-        if (PauseMenu.GameIsPaused) return;
-        
-        if (AR == true && Input.GetKey(KeyCode.Mouse0) && Time.time >= nextShotTime)
->>>>>>> parent of 392d236 (Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone)
         {
             Shot(spawnPointAR);
         }