Correct the last issues with the merge

src/Ombi.Core/Authentication/OmbiUserManager.cs

@@ -52,14 +52,10 @@ namespace Ombi.Core.Authentication
             IPasswordHasher<OmbiUser> passwordHasher, IEnumerable<IUserValidator<OmbiUser>> userValidators,
             IEnumerable<IPasswordValidator<OmbiUser>> passwordValidators, ILookupNormalizer keyNormalizer,
             IdentityErrorDescriber errors, IServiceProvider services, ILogger<UserManager<OmbiUser>> logger, IPlexApi plexApi,
-<<<<<<< HEAD
             IEmbyApiFactory embyApi, ISettingsService<EmbySettings> embySettings,
             IJellyfinApiFactory jellyfinApi, ISettingsService<JellyfinSettings> jellyfinSettings,
-            ISettingsService<AuthenticationSettings> auth)
+            ISettingsService<AuthenticationSettings> auth,
-=======
-            IEmbyApiFactory embyApi, ISettingsService<EmbySettings> embySettings, ISettingsService<AuthenticationSettings> auth,
             ILdapUserManager ldapUserManager, ISettingsService<UserManagementSettings> userManagementSettings)
->>>>>>> 691c70804f203fab858b1079a1cf3d5e4adbf322
             : base(store, optionsAccessor, passwordHasher, userValidators, passwordValidators, keyNormalizer, errors, services, logger)
         {
             _plexApi = plexApi;
@@ -74,11 +70,8 @@ namespace Ombi.Core.Authentication
 
         private readonly IPlexApi _plexApi;
         private readonly IEmbyApiFactory _embyApi;
-<<<<<<< HEAD
         private readonly IJellyfinApiFactory _jellyfinApi;
-=======
         private readonly ILdapUserManager _ldapUserManager;
->>>>>>> 691c70804f203fab858b1079a1cf3d5e4adbf322
         private readonly ISettingsService<EmbySettings> _embySettings;
         private readonly ISettingsService<JellyfinSettings> _jellyfinSettings;
         private readonly ISettingsService<AuthenticationSettings> _authSettings;
@@ -132,15 +125,13 @@ namespace Ombi.Core.Authentication
             {
                 return await CheckEmbyPasswordAsync(user, password);
             }
-<<<<<<< HEAD
             if (user.UserType == UserType.JellyfinUser)
             {
                 return await CheckJellyfinPasswordAsync(user, password);
-=======
+            }
             if (user.UserType == UserType.LdapUser)
             {
                 return await CheckLdapPasswordAsync(user, password);
->>>>>>> 691c70804f203fab858b1079a1cf3d5e4adbf322
             }
             return false;
         }

src/Ombi/ClientApp/src/app/settings/usermanagement/usermanagement.component.ts

@@ -12,11 +12,8 @@ export class UserManagementComponent implements OnInit {
 
     public plexEnabled: boolean;
     public embyEnabled: boolean;
-<<<<<<< HEAD
     public jellyfinEnabled: boolean;
-=======
     public ldapEnabled: boolean;
->>>>>>> 691c70804f203fab858b1079a1cf3d5e4adbf322
     public settings: IUserManagementSettings;
     public claims: ICheckbox[];
 
@@ -49,11 +46,7 @@ export class UserManagementComponent implements OnInit {
         this.settingsService.getUserManagementSettings().subscribe(x => {
             this.settings = x;
 
-<<<<<<< HEAD
+            if(x.importEmbyUsers || x.importJellyfinUsers || x.importPlexUsers || x.importLdapUsers) {
-            if(x.importEmbyUsers || x.importJellyfinUsers || x.importPlexUsers) {
-=======
-            if(x.importEmbyUsers || x.importPlexUsers || x.importLdapUsers) {
->>>>>>> 691c70804f203fab858b1079a1cf3d5e4adbf322
                 this.enableImportButton = true;
             }
 
@@ -108,11 +101,8 @@ export class UserManagementComponent implements OnInit {
         });
         this.settingsService.getPlex().subscribe(x => this.plexEnabled = x.enable);
         this.settingsService.getEmby().subscribe(x => this.embyEnabled = x.enable);
-<<<<<<< HEAD
         this.settingsService.getJellyfin().subscribe(x => this.jellyfinEnabled = x.enable);
-=======
         this.settingsService.getLdap().subscribe(x => this.ldapEnabled = x.isEnabled);
->>>>>>> 691c70804f203fab858b1079a1cf3d5e4adbf322
     }
 
     public submit(): void {
@@ -122,14 +112,9 @@ export class UserManagementComponent implements OnInit {
         this.settings.defaultRoles = enabledClaims.map((claim) => claim.value);
         this.settings.bannedPlexUserIds = this.bannedPlexUsers.map((u) => u.id);
         this.settings.bannedEmbyUserIds = this.bannedEmbyUsers.map((u) => u.id);
-<<<<<<< HEAD
         this.settings.bannedJellyfinUserIds = this.bannedJellyfinUsers.map((u) => u.id);
         
         if(this.settings.importEmbyUsers || this.settings.importJellyfinUsers || this.settings.importPlexUsers) {
-=======
-
-        if(this.settings.importEmbyUsers || this.settings.importPlexUsers) {
->>>>>>> 691c70804f203fab858b1079a1cf3d5e4adbf322
             this.enableImportButton = true;
         }
 
@@ -158,11 +143,8 @@ export class UserManagementComponent implements OnInit {
 
         this.jobService.runPlexImporter().subscribe();
         this.jobService.runEmbyImporter().subscribe();
-<<<<<<< HEAD
         this.jobService.runJellyfinImporter().subscribe();
-=======
         this.jobService.runLdapImporter().subscribe();
->>>>>>> 691c70804f203fab858b1079a1cf3d5e4adbf322
     }
 
     private filter(query: string, users: IUsersModel[]): IUsersModel[] {

src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.html

@@ -137,31 +137,6 @@
         </div>
     </div>
 
-<<<<<<< HEAD
-    <mat-form-field appearance="outline" class="full">
-        <mat-label>Movie Request Limit</mat-label>
-        <input matInput id="movieRequestLimit" name="movieRequestLimit"  [(ngModel)]="bulkMovieLimit">
-    </mat-form-field>
-    <mat-form-field appearance="outline"  class="full">
-        <mat-label>Episode Request Limit</mat-label>
-        <input matInput id="episodeRequestLimit" name="episodeRequestLimit"  [(ngModel)]="bulkEpisodeLimit">
-    </mat-form-field>
-    <mat-form-field appearance="outline"  class="full">
-        <mat-label>Music Request Limit</mat-label>
-        <input matInput id="musicRequestLimit" name="musicRequestLimit"  [(ngModel)]="bulkMusicLimit">
-    </mat-form-field>
-    <mat-form-field  appearance="outline"  class="full">
-        <mat-label [translate]="'UserPreferences.StreamingCountry'"></mat-label>
-        <mat-select [(value)]="bulkStreaming">
-          <mat-option *ngFor="let value of countries" [value]="value">
-            {{value}}
-          </mat-option>
-        </mat-select>
-      </mat-form-field>
-
-
-<button type="button" mat-raised-button (click)="bulkUpdate()">Update Users</button>
-=======
     <div class="form-group">
             <label for="movieRequestLimit" class="control-label">Movie Request Limit</label>
             <div>
@@ -177,7 +152,6 @@
         </div>
 
 <button type="button" class="btn btn-success-outline" (click)="bulkUpdate()">Update Users</button>
->>>>>>> 691c70804f203fab858b1079a1cf3d5e4adbf322
 </p-sidebar>
 </div>
 </div>