1 files changed, 0 insertions, 4 deletions

diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 602616f..0bf75b0 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -691,11 +691,7 @@ namespace OpenSim.Services.LLLoginService
                         }
                     }
                 }
-<<<<<<< HEAD:OpenSim/Services/LLLoginService/LLLoginService.cs
-            }

-=======
             }
->>>>>>> master:OpenSim/Services/LLLoginService/LLLoginService.cs
             dest = destination;
             if (success)
                 return aCircuit;