1 files changed, 1 insertions, 14 deletions

diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 6363422..0a99e30 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -2955,14 +2955,8 @@ Console.WriteLine(" JointCreateFixed");
                     m_log.WarnFormat("[PHYSICS]: Got NaN PIDTarget from Scene on Object {0}", Name);
             } 
         }
-<<<<<<< HEAD
-        public override bool PIDActive { get; set; }
-=======
-        // os version
-        //public override bool PIDActive {get { return m_usePID; } set { m_usePID = value; } }
-        public override bool PIDActive { set { m_usePID = value; } }
 
->>>>>>> avn/ubitvar
+        public override bool PIDActive { get; set; }
         public override float PIDTau { set { m_PIDTau = value; } }
 
         public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } }
@@ -3359,14 +3353,7 @@ Console.WriteLine(" JointCreateFixed");
                         RequestAssetDelegate assetProvider = _parent_scene.RequestAssetMethod;
                         if (assetProvider != null)
                             assetProvider(_pbs.SculptTexture, MeshAssetReceived);
-<<<<<<< HEAD
                     }, null, "ODEPrim.CheckMeshAsset");
-=======
-                    // os version
-                    //}, null, "ODEPrim.CheckMeshAsset");
-                    // avn
-                    });
->>>>>>> avn/ubitvar
             }
         }