Animation tweak

2025-02-07 17:52:21 -05:00
parent a0e6711a9e
commit d409d3087a
2 changed files with 0 additions and 6 deletions
--- a/Assets/.DS_Store
+++ b/Assets/.DS_Store
--- 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