1 files changed, 0 insertions, 24 deletions

diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 7472050..0f39273 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -402,7 +402,6 @@ namespace OpenSim.Region.DataSnapshot
                 string url = services[i].Trim();
                 using (RestClient cli = new RestClient(url))
                 {
-<<<<<<< HEAD
                     cli.AddQueryParameter("service", serviceName);
                     cli.AddQueryParameter("host", m_hostname);
                     cli.AddQueryParameter("port", m_listener_port);
@@ -436,30 +435,7 @@ namespace OpenSim.Region.DataSnapshot
                     // string responseStr = Util.UTF8.GetString(response);
                     m_log.Info("[DATASNAPSHOT]: data service " + url + " notified. Secret: " + m_Secret);
                 }
-=======
-                    m_log.Warn("[DATASNAPSHOT]: Ignoring unknown exception " + e.ToString());
-                }
-
-                byte[] response = new byte[1024];
-                // int n = 0;
-                try
-                {
-                    // n = reply.Read(response, 0, 1024);
-                    reply.Read(response, 0, 1024);
-                }
-                catch (Exception e)
-                {
-                    m_log.WarnFormat("[DATASNAPSHOT]: Unable to decode reply from data service. Ignoring. {0}", e.StackTrace);
-                }
-                // This is not quite working, so...
-                // string responseStr = Util.UTF8.GetString(response);
-                m_log.Info("[DATASNAPSHOT]: data service " + url + " notified. Secret: " + m_Secret);
-
-                if(reply != null)
-                    reply.Close();
->>>>>>> avn/ubitvar
             }
-
         }
         #endregion