From 91af42c0bdd3110af2248a8976fac89443d2b190 Mon Sep 17 00:00:00 2001
From: Dander7BD <dander.1981@gmail.com>
Date: Thu, 21 Nov 2013 17:27:28 +0100
Subject: [PATCH] Merge conflict fixed

---
 Code/OysterPhysics3D/RigidBody.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Code/OysterPhysics3D/RigidBody.cpp b/Code/OysterPhysics3D/RigidBody.cpp
index 980fbcb5..748d2272 100644
--- a/Code/OysterPhysics3D/RigidBody.cpp
+++ b/Code/OysterPhysics3D/RigidBody.cpp
@@ -70,11 +70,7 @@ void RigidBody::Update_LeapFrog( Float deltaTime )
 		this->box.center += deltaPos;
 	}
 
-<<<<<<< HEAD
-	// update movements and clear impulseForceSum and impulseTorqueSum
-=======
 	// update momentums and clear impulseForceSum and impulseTorqueSum
->>>>>>> origin/RigidBody
 	this->linearMomentum += linearImpulse;
 	this->impulseForceSum = Float3::null;
 	this->angularMomentum += angularImpulse;