README update

README.md

@@ -1,10 +1,5 @@
-<<<<<<< HEAD
-Torque 3D v3.5 - PhysX 3.3 Basic Plugin
+Torque 3D v3.5.1 - PhysX 3.3 Basic Plugin
 ==========================
-=======
-Torque 3D v3.5.1
-================
->>>>>>> GarageGames/development
 
 This is a basic PhysX 3.3 plugin that does not contain any added features like cloth,particles and CCD. This plugin provides no more features than the bullet plugin and can therefore be used as a drop in alternative. It does not modify any files outside of the physx3 folder. A far more advanced physx3 plugin with CCD, cloth and particles can be found on this repository under the physx3 branch.
 
@@ -30,7 +25,6 @@ Setting up PhysX 3.3 manually
 
 The following libraries will also be needed:
  
-<<<<<<< HEAD
 Release , Debug
 
  - PhysX3_x86.lib,PhysX3CHECKED_x86.lib