diff options
| author | David <daullmer@gmail.com> | 2020-06-14 12:45:49 +0200 |
|---|---|---|
| committer | David <daullmer@gmail.com> | 2020-06-14 12:45:49 +0200 |
| commit | d01f56bc423c81b4f86ed1591c61b6b4ef579c24 (patch) | |
| tree | 424aa3c1601e2c1a82dc685c356bfd0d50437f04 /MediaBrowser.Providers/Folders/CollectionFolderMetadataService.cs | |
| parent | a47ff4043f2116716d5f15d1f79657550052bde8 (diff) | |
| parent | 0011e8df47380936742302ef40639a4626a780ed (diff) | |
Merge remote-tracking branch 'upstream/api-migration' into api-subtitles
Diffstat (limited to 'MediaBrowser.Providers/Folders/CollectionFolderMetadataService.cs')
| -rw-r--r-- | MediaBrowser.Providers/Folders/CollectionFolderMetadataService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Providers/Folders/CollectionFolderMetadataService.cs b/MediaBrowser.Providers/Folders/CollectionFolderMetadataService.cs index 921222543..0d00db3eb 100644 --- a/MediaBrowser.Providers/Folders/CollectionFolderMetadataService.cs +++ b/MediaBrowser.Providers/Folders/CollectionFolderMetadataService.cs @@ -23,7 +23,7 @@ namespace MediaBrowser.Providers.Folders } /// <inheritdoc /> - protected override void MergeData(MetadataResult<CollectionFolder> source, MetadataResult<CollectionFolder> target, MetadataFields[] lockedFields, bool replaceData, bool mergeMetadataSettings) + protected override void MergeData(MetadataResult<CollectionFolder> source, MetadataResult<CollectionFolder> target, MetadataField[] lockedFields, bool replaceData, bool mergeMetadataSettings) { ProviderUtils.MergeBaseItemData(source, target, lockedFields, replaceData, mergeMetadataSettings); } |