1 files changed, 0 insertions, 3 deletions

diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index a6dc287..b33b0d5 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -110,14 +110,11 @@ namespace OpenSim.Server.Handlers.Simulation
                 DoAgentDelete(request, responsedata, agentID, action, regionID);
                 return responsedata;
             }
-<<<<<<< HEAD:OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
             else if (method.Equals("DELETECHILD"))
             {
                 DoChildAgentDelete(request, responsedata, agentID, action, regionID);
                 return responsedata;
             }
-=======
->>>>>>> master:OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
             else if (method.Equals("QUERYACCESS"))
             {
                 DoQueryAccess(request, responsedata, agentID, regionID);