diff options
| author | crobibero <cody@robibe.ro> | 2020-06-13 15:07:04 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-06-13 15:07:04 -0600 |
| commit | bd0975397613cc87bb97ae20a0608257487d0f77 (patch) | |
| tree | 8588828ec26b4d86ff2a597c5f069ee45abe75cc /MediaBrowser.Providers/LiveTv/ProgramMetadataService.cs | |
| parent | fd913d73e35491c64e39a76a266689c302a91b11 (diff) | |
| parent | 0011e8df47380936742302ef40639a4626a780ed (diff) | |
Merge remote-tracking branch 'upstream/api-migration' into api-image
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); } |