diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index ae942f939e..27cb13791f 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -408,8 +408,6 @@ namespace OpenSim
                 scene.SnmpService.BootInfo("ScriptEngine started", scene);
             }
 
-=======
->>>>>>> master:OpenSim/Region/Application/OpenSimBase.cs
             m_sceneManager.Add(scene);
 
             if (m_autoCreateClientStack)