1 files changed, 1 insertions, 3 deletions

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index a536757..7d0c47f 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -336,8 +336,6 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             }
         }
 
-<<<<<<< HEAD
-=======
         /// <summary>
         /// 
         /// </summary>
@@ -433,7 +431,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             }
         }
 
->>>>>>> avn/ubitvar
+
         #region IUserManagement
 
         public UUID GetUserIdByName(string name)