1

chrysalisXu · Apr 13, 2023 · 0c88024 · 0c88024
1 parent af66604
commit 0c88024
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/Assets/Scenes/Collision.unity b/Assets/Scenes/Collision.unity
@@ -156,11 +156,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   springCoefficient: 100
-<<<<<<< Updated upstream
   dampingCoefficient: 1
-=======
-  dampingCoefficient: 0
->>>>>>> Stashed changes
   HalfSideLength: 20
   FixPos: 3
   mass: 10