Merge pull request #2847 from MediaBrowser/beta

Beta

2 files changed, 1 insertions, 10 deletions

diff --git a/MediaBrowser.Controller/Channels/IChannelManager.cs b/MediaBrowser.Controller/Channels/IChannelManager.cs
index 824bdf8ffb..46e55a21ce 100644
--- a/MediaBrowser.Controller/Channels/IChannelManager.cs
+++ b/MediaBrowser.Controller/Channels/IChannelManager.cs
@@ -30,7 +30,7 @@ namespace MediaBrowser.Controller.Channels
         /// Gets all channel features.
         /// </summary>
         /// <returns>IEnumerable{ChannelFeatures}.</returns>
-        IEnumerable<ChannelFeatures> GetAllChannelFeatures();
+        ChannelFeatures[] GetAllChannelFeatures();
 
         /// <summary>
         /// Gets the channel.
diff --git a/MediaBrowser.Controller/Channels/InternalChannelFeatures.cs b/MediaBrowser.Controller/Channels/InternalChannelFeatures.cs
index 7d80d7e12a..976808aad9 100644
--- a/MediaBrowser.Controller/Channels/InternalChannelFeatures.cs
+++ b/MediaBrowser.Controller/Channels/InternalChannelFeatures.cs
@@ -58,13 +58,4 @@ namespace MediaBrowser.Controller.Channels
             DefaultSortFields = new List<ChannelItemSortField>();
         }
     }
-
-    public class ChannelDownloadException : Exception
-    {
-        public ChannelDownloadException(string message)
-            : base(message)
-        {
-
-        }
-    }
 }