seems to compile ( tests comented out)

1 files changed, 1 insertions, 5 deletions

diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 616c673..85976ab 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -1947,14 +1947,10 @@ namespace OpenSim.Framework.Servers.HttpServer
                 m_httpListener2.Start(64);
 
                 // Long Poll Service Manager with 3 worker threads a 25 second timeout for no events
-<<<<<<< HEAD
+
                 PollServiceRequestManager = new PollServiceRequestManager(this, performPollResponsesAsync, 3, 25000);
                 PollServiceRequestManager.Start();
 
-=======
-                m_PollServiceManager = new PollServiceRequestManager(this, 4, 25000);
-                m_PollServiceManager.Start();
->>>>>>> avn/ubitvar
                 HTTPDRunning = true;
 
                 //HttpListenerContext context;