1 files changed, 5 insertions, 0 deletions

diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 05eaf2a..9203169 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -1251,7 +1251,12 @@ namespace OpenSim.Region.Physics.OdePlugin
         public override Vector3 PIDTarget { set { return; } }
         public override bool PIDActive 
         { 
+<<<<<<< HEAD
             get { return false; }
+=======
+            // os version
+            // get { return false; }
+>>>>>>> avn/ubitvar
             set { return; } 
         }
         public override float PIDTau { set { return; } }