fix

Code/GameLogic/CollisionManager.cpp

@@ -18,7 +18,6 @@ void CollisionManager::ColisionEvent(Oyster::Physics::ICustomBody &obj1, Oyster:
 	Object *realObj1 = refManager->GetMap(obj1);
 	Object *realObj2 = refManager->GetMap(obj2);
 	
-	
 	switch(realObj1->GetType())
 	{
 	case Object::OBJECT_TYPE_PLAYER:
@@ -28,8 +27,6 @@ void CollisionManager::ColisionEvent(Oyster::Physics::ICustomBody &obj1, Oyster:
 			PlayerVBox(*((Player*)realObj1),*((DynamicObject*)realObj2));
 		}
 
-
-
 		break;
 	case Object::OBJECT_TYPE_BOX:
 

Code/GameLogic/Object.h

@@ -27,12 +27,7 @@ namespace GameLogic
 			OBJECT_TYPE_BOX,
 		};
 		
-<<<<<<< HEAD
-		void Render();
-		void Update();
-=======
 		Oyster::Graphics::Model::Model* Render();
->>>>>>> 01515a4d2d309cfebf4e3dab3ad68787f93050e1
 
 		OBJECT_TYPE GetType();
 
@@ -43,13 +38,9 @@ namespace GameLogic
 		//either a model pointer or an ID to an arraypos filled with models that are to be rendered
 		//rigidBody
 
-<<<<<<< HEAD
 		Utility::DynamicMemory::UniquePointer<Oyster::Physics::ICustomBody> rigidBody;
 		Utility::DynamicMemory::UniquePointer<Oyster::Graphics::Model::Model> model;
-=======
-		Oyster::Physics::ICustomBody* rigidBody;
-		Oyster::Graphics::Model::Model* model;
->>>>>>> 01515a4d2d309cfebf4e3dab3ad68787f93050e1
+
 	};
 
 }