Fix merge

2021-02-23 09:05:06 +01:00
parent 159747ab61
commit 20a70ec133
17 changed files with 28 additions and 43 deletions
--- a/src/Umbraco.Web.Common/Security/MemberManager.cs
+++ b/src/Umbraco.Web.Common/Security/MemberManager.cs
@@ -10,11 +10,10 @@ using Umbraco.Cms.Core.Models.ContentEditing;
 using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Net;
 using Umbraco.Cms.Core.Security;
-using Umbraco.Core.Security;
 using Umbraco.Extensions;


-namespace Umbraco.Web.Common.Security
+namespace Umbraco.Cms.Web.Common.Security
 {
    public class MemberManager : UmbracoUserManager<MembersIdentityUser, MemberPasswordConfigurationSettings>, IMemberManager
    {