And another

2010-06-24 03:43:50 +02:00 · 2010-06-24 03:43:50 +02:00 · 9d03271265
parent e94cf3d9b7
commit 9d03271265
1 changed files with 0 additions and 2 deletions
--- 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)