Fix merge conflicts

2 files changed, 3 insertions, 10 deletions

diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index 8241e8f..b82586f 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -249,9 +249,9 @@ namespace OpenSim.Region.Physics.Manager
         public abstract float APIDStrength { set;}
         public abstract float APIDDamping { set;}
         
-        public abstract void AddForce(PhysicsVector force, bool pushforce);
-        public abstract void AddAngularForce(PhysicsVector force, bool pushforce);
-        public abstract void SetMomentum(PhysicsVector momentum);
+        public abstract void AddForce(Vector3 force, bool pushforce);
+        public abstract void AddAngularForce(Vector3 force, bool pushforce);
+        public abstract void SetMomentum(Vector3 momentum);
         public abstract void SubscribeEvents(int ms);
         public abstract void UnSubscribeEvents();
         public abstract bool SubscribedEvents();
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index b963d65..8f2c801 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -107,17 +107,10 @@ namespace OpenSim.Region.Physics.OdePlugin
         private float m_PIDHoverTau;
         private bool m_useHoverPID;
         private PIDHoverType m_PIDHoverType = PIDHoverType.Ground;
-<<<<<<< HEAD:OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
-        private float m_targetHoverHeight = 0f;
-        private float m_groundHeight = 0f;
-        private float m_waterHeight = 0f;
-        private float m_buoyancy = 0f;                          //Set by llSetBuoyancy(), for non-vehicles. 
-=======
         private float m_targetHoverHeight;
         private float m_groundHeight;
         private float m_waterHeight;
         private float m_buoyancy;                               //KF: m_buoyancy should be set by llSetBuoyancy() for non-vehicle. 
->>>>>>> vehicles:OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
 
         // private float m_tensor = 5f;
         private int body_autodisable_frames = 20;