From 38344706f33ae7e169ed83859ee90046cdd42e50 Mon Sep 17 00:00:00 2001
From: Jens Pitkanen <jens@neon.moe>
Date: Sat, 8 Aug 2020 10:21:50 +0300
Subject: [PATCH] Finish merge??

---
 Assets/Scripts/Players/Player.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Assets/Scripts/Players/Player.cs b/Assets/Scripts/Players/Player.cs
index 4b11fb0..bb1d985 100644
--- a/Assets/Scripts/Players/Player.cs
+++ b/Assets/Scripts/Players/Player.cs
@@ -206,12 +206,8 @@ namespace NeonTea.Quakeball.Players {
             }
             Debug.Log("I was hit! Aaagh!");
             Splatter.Play();
-<<<<<<< HEAD
             HitAudioSource.Play();
             LocalHitAudioSource.Play();
-=======
-            HitAudioSource.PlayOneShot(HitClip);
->>>>>>> cbce3a6a7c2ad4de57bd4feb36e306e603039960
         }
 
         public bool IsGrounded() {