diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/UserManagement')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | 4 |
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 | |||
336 | } | 336 | } |
337 | } | 337 | } |
338 | 338 | ||
339 | <<<<<<< HEAD | ||
340 | ======= | ||
341 | /// <summary> | 339 | /// <summary> |
342 | /// | 340 | /// |
343 | /// </summary> | 341 | /// </summary> |
@@ -433,7 +431,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
433 | } | 431 | } |
434 | } | 432 | } |
435 | 433 | ||
436 | >>>>>>> avn/ubitvar | 434 | |
437 | #region IUserManagement | 435 | #region IUserManagement |
438 | 436 | ||
439 | public UUID GetUserIdByName(string name) | 437 | public UUID GetUserIdByName(string name) |