From e66668ad7edea06b3e1d52f3daceec84fd5f73f9 Mon Sep 17 00:00:00 2001
From: "Huaiyu (Kitty) Liu" <huaiyu.liu@intel.com>
Date: Tue, 15 Feb 2011 15:07:43 -0800
Subject: [PATCH] Some conflict, probably due to line ending at
 LocalGridServiceConnector.cs. Just commit the difference to move on.

---
 .../ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
index 2a10f8461d..5418b0590f 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
@@ -283,7 +283,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             return m_GridService.LookupQuark(locX, locY, actorType);
         }
         public bool CleanUpEndpoint(string syncServerID)
-        {
+        {
             return m_GridService.CleanUpEndpoint(syncServerID);
         }
         #endregion SYNC SERVER