From c07bef0e1bda0273ae2464f6744ac77cf2995bae Mon Sep 17 00:00:00 2001
From: Mark McDowall <markus.mcd5@gmail.com>
Date: Thu, 18 Jul 2013 23:22:49 -0700
Subject: [PATCH] Fixed merge conflict

---
 NzbDrone.Core/MediaFiles/MediaFileService.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/NzbDrone.Core/MediaFiles/MediaFileService.cs b/NzbDrone.Core/MediaFiles/MediaFileService.cs
index a53b0f85a..66e625357 100644
--- 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);