Fixed merge issues

This commit is contained in:
Emma Garland
2021-03-17 17:44:49 +00:00
parent 92c8901b58
commit e7e5e18b19

View File

@@ -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)
{
}
}
}