From d409d3087a8e80d85a1039383a2f9368b5195196 Mon Sep 17 00:00:00 2001
From: RochesterX <trevorisaacmaze@gmail.com>
Date: Fri, 7 Feb 2025 17:52:21 -0500
Subject: [PATCH] Animation tweak

---
 Assets/.DS_Store            | Bin 6148 -> 6148 bytes
 Assets/Prefabs/Bones.prefab |   6 ------
 2 files changed, 6 deletions(-)

diff --git a/Assets/.DS_Store b/Assets/.DS_Store
index 837018ba6ca03962006fe298e0a30427e2b50aca..fa89f95fe165c3e9bbab363938b8404611304b87 100644
GIT binary patch
delta 80
zcmZoMXfc=|#>B)qu~2NHo+2aj#DLw41(+BanJ4owzU5_S2w*5;NM%T4NMuOb{DP5@
ibu&8$KL=3#W=5v(%#-;=EIAk%7=Va@VRL}U7G?kenh{<A

delta 68
zcmZoMXfc=|#>B`mu~2NHo+2aD#DLwC4MbQb^E18LEYAFaWn+UJ<7Rdaeh#3T&5F$5
WnJ4p$SaL7`0V4wg)8+t?EzAIZxDcoS

diff --git a/Assets/Prefabs/Bones.prefab b/Assets/Prefabs/Bones.prefab
index fcc0485..e1a6b85 100644
--- a/Assets/Prefabs/Bones.prefab
+++ b/Assets/Prefabs/Bones.prefab
@@ -271,8 +271,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   terminalVelocity: -15
-<<<<<<< Updated upstream
-=======
 --- !u!111 &6769589999303328011
 Animation:
   m_ObjectHideFlags: 0
@@ -303,10 +301,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   blockArea: {fileID: 4413221056628714154}
   blocking: 0
-<<<<<<< Updated upstream
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
 --- !u!1 &1648017802882051395
 GameObject:
   m_ObjectHideFlags: 0