From 23ef56826940b03a74d2e1b80b06f187a3dec580 Mon Sep 17 00:00:00 2001
From: Sam Gateau <sam@highfidelity.io>
Date: Sat, 9 May 2015 11:48:30 -0700
Subject: [PATCH] fixing file

---
 libraries/physics/src/PhysicalEntitySimulation.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/libraries/physics/src/PhysicalEntitySimulation.cpp b/libraries/physics/src/PhysicalEntitySimulation.cpp
index 06099d19dc..50e81b4788 100644
--- a/libraries/physics/src/PhysicalEntitySimulation.cpp
+++ b/libraries/physics/src/PhysicalEntitySimulation.cpp
@@ -167,12 +167,8 @@ VectorOfMotionStates& PhysicalEntitySimulation::getObjectsToAdd() {
                 _tempVector.push_back(motionState);
                 entityItr = _pendingAdds.erase(entityItr);
             } else {
-<<<<<<< HEAD
-              //  qDebug() << "Warning!  Failed to generate new shape for entity." << entity->getName();
-=======
                 // TODO: Seth to look into why this case is hit.
                 //qDebug() << "Warning!  Failed to generate new shape for entity." << entity->getName();
->>>>>>> 72e1ea688adad9914d9994b81a96225ac411ba83
                 ++entityItr;
             }
         } else {