aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Providers/Channels
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-08-09 15:56:38 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-08-09 15:56:38 -0400
commit40442f887ba717ae47620b152315f21b252fe049 (patch)
tree340be082fd2296f19aed17b24b22b5095e3815a7 /MediaBrowser.Providers/Channels
parent52aeb3c40b3e2f0fdc377ac7c793714add2be0ef (diff)
consolidate emby.server.core into emby.server.implementations
Diffstat (limited to 'MediaBrowser.Providers/Channels')
-rw-r--r--MediaBrowser.Providers/Channels/ChannelMetadataService.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Providers/Channels/ChannelMetadataService.cs b/MediaBrowser.Providers/Channels/ChannelMetadataService.cs
index 8a3da5bf4..b22db559e 100644
--- a/MediaBrowser.Providers/Channels/ChannelMetadataService.cs
+++ b/MediaBrowser.Providers/Channels/ChannelMetadataService.cs
@@ -14,7 +14,7 @@ namespace MediaBrowser.Providers.Channels
{
public class ChannelMetadataService : MetadataService<Channel, ItemLookupInfo>
{
- protected override void MergeData(MetadataResult<Channel> source, MetadataResult<Channel> target, List<MetadataFields> lockedFields, bool replaceData, bool mergeMetadataSettings)
+ protected override void MergeData(MetadataResult<Channel> source, MetadataResult<Channel> target, MetadataFields[] lockedFields, bool replaceData, bool mergeMetadataSettings)
{
ProviderUtils.MergeBaseItemData(source, target, lockedFields, replaceData, mergeMetadataSettings);
}