diff options
| author | crobibero <cody@robibe.ro> | 2020-06-19 10:49:49 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-06-19 10:49:49 -0600 |
| commit | 494f6970724f3243ed5a6ebe89d756bf2759d3eb (patch) | |
| tree | 3b46944461c30fb750170534d15dc90ffa386be0 /MediaBrowser.Providers/LiveTv/ProgramMetadataService.cs | |
| parent | 000088f8f94e24ea715f15b722a2e64958bec07b (diff) | |
| parent | 305808dd0ac4f86bb1663e7f6ba2b22064ace0ba (diff) | |
Merge remote-tracking branch 'upstream/api-migration' into api-library
Diffstat (limited to 'MediaBrowser.Providers/LiveTv/ProgramMetadataService.cs')
| -rw-r--r-- | MediaBrowser.Providers/LiveTv/ProgramMetadataService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Providers/LiveTv/ProgramMetadataService.cs b/MediaBrowser.Providers/LiveTv/ProgramMetadataService.cs index 7dd49c71a..ccf90d7ac 100644 --- a/MediaBrowser.Providers/LiveTv/ProgramMetadataService.cs +++ b/MediaBrowser.Providers/LiveTv/ProgramMetadataService.cs @@ -22,7 +22,7 @@ namespace MediaBrowser.Providers.LiveTv } /// <inheritdoc /> - protected override void MergeData(MetadataResult<LiveTvChannel> source, MetadataResult<LiveTvChannel> target, MetadataFields[] lockedFields, bool replaceData, bool mergeMetadataSettings) + protected override void MergeData(MetadataResult<LiveTvChannel> source, MetadataResult<LiveTvChannel> target, MetadataField[] lockedFields, bool replaceData, bool mergeMetadataSettings) { ProviderUtils.MergeBaseItemData(source, target, lockedFields, replaceData, mergeMetadataSettings); } |