From 030cd225bf13415402197bb6907375357c1ad441 Mon Sep 17 00:00:00 2001
From: Evan Nydahl <nydahle8784@my.uwstout.edu>
Date: Wed, 27 Apr 2022 18:54:24 -0500
Subject: [PATCH] Merge dAerialScript

---
 .../DebugAerialState/DebugAerial/dAerialFallingState.cs        | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugAerialState/DebugAerial/dAerialFallingState.cs b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugAerialState/DebugAerial/dAerialFallingState.cs
index 15561bc..f9a0d76 100644
--- a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugAerialState/DebugAerial/dAerialFallingState.cs
+++ b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugAerialState/DebugAerial/dAerialFallingState.cs
@@ -6,16 +6,13 @@ public class dAerialFallingState : dAerialBaseState
 {
     bool shouldGlide;
     public override void EnterState(dAerialStateManager aSM, dAerialBaseState previousState){
-<<<<<<< HEAD
         if(previousState == aSM.JumpingState && aSM.jumpHeld){
             shouldGlide = true;
         }
         else{
             shouldGlide = false;
         }
-=======
         aSM.GetComponent<Animator>().SetBool("isFalling", true);
->>>>>>> animations4
     }
 
     public override void ExitState(dAerialStateManager aSM, dAerialBaseState nextState){