diff options
| author | crobibero <cody@robibe.ro> | 2020-06-20 15:56:42 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-06-20 15:56:42 -0600 |
| commit | 3329b08b40bb7d7e98264969c1b4c9e356fbdec2 (patch) | |
| tree | fbbaa4e95adf35533f037ae18490d908eff5a608 /MediaBrowser.Providers/LiveTv/ProgramMetadataService.cs | |
| parent | 7a77b9928f2c8326e85629d3c900e86c3b26342a (diff) | |
| parent | 576ffeb2a99e79caf0035eb9166436d1e0161d2c (diff) | |
Merge remote-tracking branch 'upstream/api-migration' into api-playlist
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); } |