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/Neighbour/NeighbourServicesConnector.cs | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'OpenSim/Services/Connectors/Neighbour')

diff --git a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
index e236ec3..70f1aee 100644
--- a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
@@ -153,15 +153,9 @@ namespace OpenSim.Services.Connectors
             }
             catch (Exception e)
             {
-<<<<<<< HEAD
-                m_log.Warn(string.Format(
-                    "[NEIGHBOUR SERVICES CONNECTOR]: Unable to send HelloNeighbour from {0} to {1} (uri {2}).  Exception {3} ",
-                    thisRegion.RegionName, region.RegionName, uri, e.Message), e);
-=======
 //                m_log.WarnFormat(
 //                    "[NEIGHBOUR SERVICE CONNCTOR]: Unable to send HelloNeighbour from {0} to {1}.  Exception {2}{3}",
 //                    thisRegion.RegionName, region.RegionName, e.Message, e.StackTrace);
->>>>>>> avn/ubitvar
 
                 return false;
             }
-- 
cgit v1.1