1 files changed, 0 insertions, 3 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 5fdbf9d..6e8a96d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -739,11 +739,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
                 if (Position.y > ((int)Constants.RegionSize - 1))
                     Position.y = ((int)Constants.RegionSize - 1);
                  */
-<<<<<<< HEAD
                 if (Position.z > Constants.RegionHeight)
                     Position.z = Constants.RegionHeight;
-=======
->>>>>>> avn/ubitvar
                 if (Position.x < 0)
                     Position.x = 0;
                 if (Position.y < 0)