Merge branch 'beta'

1 files changed, 1 insertions, 2 deletions

diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index f294d1dec..5f42dd2de 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -46,7 +46,7 @@ namespace MediaBrowser.Model.Configuration
         public string[] PlainFolderViews { get; set; }
 
         public bool HidePlayedInLatest { get; set; }
-        public bool DisplayChannelsInline { get; set; }
+        public bool EnableChannelView { get; set; }
 
         public bool RememberAudioSelections { get; set; }
         public bool RememberSubtitleSelections { get; set; }
@@ -60,7 +60,6 @@ namespace MediaBrowser.Model.Configuration
             EnableNextEpisodeAutoPlay = true;
             RememberAudioSelections = true;
             RememberSubtitleSelections = true;
-            DisplayChannelsInline = true;
 
             HidePlayedInLatest = true;
             PlayDefaultAudioTrack = true;