From f20dc512e87983b9ba6b86f806489380d3cfef5a Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Mon, 9 Aug 2010 02:46:09 +0200
Subject: Whitespace conflict

---
 OpenSim/Region/Framework/Scenes/Scene.cs          | 2 +-
 OpenSim/Services/LLLoginService/LLLoginService.cs | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 779f898..06bbe32 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3513,7 +3513,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (tp == TeleportFlags.ViaLogin)
             {
                 if (land != null && !TestLandRestrictions(agent, land, out reason))
-                {
+                {
                     m_log.DebugFormat("[CONNECTION BEGIN]: Denying access to {0} due to no land access", agent.AgentID.ToString());
                     return false;
                 }
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;
-- 
cgit v1.1