diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-11-23 11:02:48 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-11-23 11:02:48 -0500 |
| commit | 708c000be5be30fafd3a92497be29c6975c9909e (patch) | |
| tree | 694758cf06050fe30a341b106fec85c37382a646 /MediaBrowser.Providers/Folders | |
| parent | 155c51908095177e42c31ebe5f13cf533318ad06 (diff) | |
fix merge conflicts
Diffstat (limited to 'MediaBrowser.Providers/Folders')
| -rw-r--r-- | MediaBrowser.Providers/Folders/DefaultImageProvider.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MediaBrowser.Providers/Folders/DefaultImageProvider.cs b/MediaBrowser.Providers/Folders/DefaultImageProvider.cs index 830a8c016..1f36c0976 100644 --- a/MediaBrowser.Providers/Folders/DefaultImageProvider.cs +++ b/MediaBrowser.Providers/Folders/DefaultImageProvider.cs @@ -51,7 +51,7 @@ namespace MediaBrowser.Providers.Folders if (!string.IsNullOrWhiteSpace(url)) { - list.AddRange(new List<RemoteImageInfo>{ + list.AddRange(new List<RemoteImageInfo>{ new RemoteImageInfo { ProviderName = Name, @@ -93,7 +93,7 @@ namespace MediaBrowser.Providers.Folders } if (string.Equals(viewType, CollectionType.TvShows, StringComparison.OrdinalIgnoreCase)) { - return urlPrefix + "tv.jpg"; + //return urlPrefix + "tv.jpg"; } if (string.Equals(viewType, CollectionType.Channels, StringComparison.OrdinalIgnoreCase)) { @@ -105,7 +105,7 @@ namespace MediaBrowser.Providers.Folders } if (string.Equals(viewType, CollectionType.Movies, StringComparison.OrdinalIgnoreCase)) { - return urlPrefix + "movies.jpg"; + //return urlPrefix + "movies.jpg"; } if (string.Equals(viewType, CollectionType.Playlists, StringComparison.OrdinalIgnoreCase)) { |