seems to compile ( tests comented out)

1 files changed, 2 insertions, 3 deletions

diff --git a/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs b/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs
index e5fb5a8..15a9fbe 100644
--- a/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs
+++ b/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs
@@ -191,14 +191,13 @@ namespace OpenSim.Services.Connectors
             return accounts;
         }
 
-<<<<<<< HEAD
         public void InvalidateCache(UUID userID)
         {
-=======
+        }
+
         public List<UserAccount> GetUserAccountsWhere(UUID scopeID, string where)
         {
             return null; // Not implemented for regions
->>>>>>> avn/ubitvar
         }
 
         public virtual bool StoreUserAccount(UserAccount data)