From a11edceb00b5b86f825bd957bdac9edb91f893dd Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Wed, 2 Sep 2015 19:54:53 +0100
Subject: seems to compile ( tests comented out)

---
 .../Connectors/SimianGrid/SimianUserAccountServiceConnector.cs       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs')

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
index 08c5c50..563a1e7 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
@@ -191,15 +191,14 @@ namespace OpenSim.Services.Connectors.SimianGrid
             return accounts;
         }
 
-<<<<<<< HEAD
         public void InvalidateCache(UUID userID)
         {
             m_accountCache.Remove(userID);
-=======
+        }
+
         public List<UserAccount> GetUserAccountsWhere(UUID scopeID, string query)
         {
             return null;
->>>>>>> avn/ubitvar
         }
 
         public bool StoreUserAccount(UserAccount data)
-- 
cgit v1.1