From 0c88024673bcbdcf10eecc1511ba4cbc9c29d625 Mon Sep 17 00:00:00 2001
From: TheLissandra1 <n.qiao@students.uu.nl>
Date: Thu, 13 Apr 2023 12:44:26 +0200
Subject: [PATCH] 1

---
 Assets/Scenes/Collision.unity | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Assets/Scenes/Collision.unity b/Assets/Scenes/Collision.unity
index 5c2ef1a..e014b3a 100644
--- 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