diff options
| author | dkanada <dkanada@users.noreply.github.com> | 2020-06-17 02:09:32 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-17 02:09:32 +0900 |
| commit | f5d82441a49c54022904603f2a7b196e48888f14 (patch) | |
| tree | d34921899cf5ab1b8715a338c60f10b1cd309448 /MediaBrowser.Providers/LiveTv/ProgramMetadataService.cs | |
| parent | 3f58bd7c586e2816c1bb3afe7a165bb9d3f131ea (diff) | |
| parent | 215ab39e00be3a79875351a76f0d836a9281ce6b (diff) | |
Merge branch 'master' into custom-repos
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 7dd49c71a9..ccf90d7ac8 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); } |