From a11edceb00b5b86f825bd957bdac9edb91f893dd Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Wed, 2 Sep 2015 19:54:53 +0100
Subject: seems to compile ( tests comented out)

---
 OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs')

diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index 10b8d22..8abd046 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
@@ -100,14 +100,10 @@ namespace OpenSim.Services.Connectors.Hypergrid
                 m_log.Error("[USER AGENT CONNECTOR]: No Server URI named in section UserAgentService");
                 throw new Exception("UserAgent connector init error");
             }
-<<<<<<< HEAD
 
             m_ServerURL = m_ServerURLHost = serviceURI;
             if (!m_ServerURL.EndsWith("/"))
                 m_ServerURL += "/";
-=======
-            m_ServerURL = serviceURI;
->>>>>>> avn/ubitvar
 
             //m_log.DebugFormat("[USER AGENT CONNECTOR]: new connector to {0}", m_ServerURL);
         }
-- 
cgit v1.1