diff options
| author | crobibero <cody@robibe.ro> | 2020-06-13 13:03:09 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-06-13 13:03:09 -0600 |
| commit | 829eb1a8494b3d0a4a5170f5942f33920f179e73 (patch) | |
| tree | 50acc3d0800da593aac0a252dad6226c73f3c1d5 /MediaBrowser.Providers/Folders/CollectionFolderMetadataService.cs | |
| parent | d975ad155e7857bcbfcf55246fd78dd87ed594ca (diff) | |
| parent | 403cd3205ffb970cfda88b6c49dc69127fada798 (diff) | |
merge master into api-migration
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); } |