Fixed merge issues
This commit is contained in:
@@ -12,7 +12,6 @@ namespace Umbraco.Cms.Web.Common.Security
|
||||
{
|
||||
public class MemberManager : UmbracoUserManager<MemberIdentityUser, MemberPasswordConfigurationSettings>, IMemberManager
|
||||
{
|
||||
|
||||
public MemberManager(
|
||||
IIpResolver ipResolver,
|
||||
IUserStore<MemberIdentityUser> store,
|
||||
@@ -24,7 +23,9 @@ namespace Umbraco.Cms.Web.Common.Security
|
||||
IServiceProvider services,
|
||||
ILogger<UserManager<MemberIdentityUser>> logger,
|
||||
IOptions<MemberPasswordConfigurationSettings> passwordConfiguration)
|
||||
: base(ipResolver, store, optionsAccessor, passwordHasher, userValidators, passwordValidators, errors, services, logger, passwordConfiguration) => _httpContextAccessor = httpContextAccessor;
|
||||
: base(ipResolver, store, optionsAccessor, passwordHasher, userValidators, passwordValidators, errors,
|
||||
services, logger, passwordConfiguration)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user