diff options
| author | crobibero <cody@robibe.ro> | 2020-06-13 15:21:13 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-06-13 15:21:13 -0600 |
| commit | 9ee6ea86ea12e177f620f3cae8d149b41475416a (patch) | |
| tree | 05b09b609f0b3a72fd670d2bbcdc0c0975f8d36e /MediaBrowser.Providers/Folders/CollectionFolderMetadataService.cs | |
| parent | a4455af3e90b440defb4da6de980f287b8a348c6 (diff) | |
| parent | 0011e8df47380936742302ef40639a4626a780ed (diff) | |
Merge remote-tracking branch 'upstream/api-migration' into api-localization
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); } |