Merge conflicts

This commit is contained in:
Joseph Milazzo 2017-06-21 06:16:22 -05:00
commit dc0db08ca8
9 changed files with 49 additions and 43 deletions

View file

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.IO;
using NLog;
@ -31,8 +31,9 @@ namespace NzbDrone.Core.MediaFiles
public void Clean(Artist artist, List<string> filesOnDisk)
{
var artistFiles = _mediaFileService.GetFilesByArtist(artist.ForeignArtistId);
var tracks = _trackService.GetTracksByArtist(artist.ForeignArtistId);
var artistFiles = _mediaFileService.GetFilesByArtist(artist.Id);
var tracks = _trackService.GetTracksByArtist(artist.Id);
var filesOnDiskKeys = new HashSet<string>(filesOnDisk, PathEqualityComparer.Instance);