diff options
| author | Techywarrior <techywarrior@gmail.com> | 2013-04-05 19:45:32 -0700 |
|---|---|---|
| committer | Techywarrior <techywarrior@gmail.com> | 2013-04-05 19:45:32 -0700 |
| commit | 51b71afd5cfcaa6db606073a24c4c891cdf46cb3 (patch) | |
| tree | b801589b7e167125b7fae7add6b9a914daeeaa10 /MediaBrowser.Controller/Entities/CollectionFolder.cs | |
| parent | 7c3f257581344aadf6f697f3159becbd613db7e2 (diff) | |
| parent | 9c7f492e2cd3b940d8041e6949cea9898a057826 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Diffstat (limited to 'MediaBrowser.Controller/Entities/CollectionFolder.cs')
| -rw-r--r-- | MediaBrowser.Controller/Entities/CollectionFolder.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/Entities/CollectionFolder.cs b/MediaBrowser.Controller/Entities/CollectionFolder.cs index c64f001c1..42c112752 100644 --- a/MediaBrowser.Controller/Entities/CollectionFolder.cs +++ b/MediaBrowser.Controller/Entities/CollectionFolder.cs @@ -1,6 +1,5 @@ using MediaBrowser.Common.Extensions; using MediaBrowser.Model.Entities; -using MediaBrowser.Model.Tasks; using System; using System.Collections.Concurrent; using System.Collections.Generic; @@ -35,7 +34,7 @@ namespace MediaBrowser.Controller.Entities /// Allow different display preferences for each collection folder /// </summary> /// <value>The display prefs id.</value> - public override Guid DisplayPreferencesId + protected override Guid DisplayPreferencesId { get { |