seems to compile ( tests comented out)

1 files changed, 2 insertions, 3 deletions

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)