seems to compile ( tests comented out)

2026-08-07 17:55:48 +08:00 · 2015-09-02 19:54:53 +01:00
parent 371c9dd2af
commit a11edceb00
157 changed files with 1315 additions and 9792 deletions
--- 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)