Fixed merge conflict

This commit is contained in:
Mark McDowall 2013-07-18 23:22:49 -07:00
parent b6b3d26868
commit c07bef0e1b
1 changed files with 5 additions and 0 deletions

View File

@ -67,6 +67,11 @@ namespace NzbDrone.Core.MediaFiles
return _mediaFileRepository.GetFilesBySeries(seriesId); return _mediaFileRepository.GetFilesBySeries(seriesId);
} }
public List<EpisodeFile> GetFilesBySeason(int seriesId, int seasonNumber)
{
return _mediaFileRepository.GetFilesBySeason(seriesId, seasonNumber);
}
public List<string> FilterExistingFiles(List<string> files, int seriesId) public List<string> FilterExistingFiles(List<string> files, int seriesId)
{ {
var seriesFiles = GetFilesBySeries(seriesId); var seriesFiles = GetFilesBySeries(seriesId);