Fixed merge conflict

11 years ago · c07bef0e1b
parent b6b3d26868
commit c07bef0e1b
1 changed files with 5 additions and 0 deletions
--- a/NzbDrone.Core/MediaFiles/MediaFileService.cs
+++ b/NzbDrone.Core/MediaFiles/MediaFileService.cs
@ -67,6 +67,11 @@ namespace NzbDrone.Core.MediaFiles
            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)
        {
            var seriesFiles = GetFilesBySeries(seriesId);