diff options
| author | crobibero <cody@robibe.ro> | 2020-06-13 15:21:50 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-06-13 15:21:50 -0600 |
| commit | 50f6d8029dbf0460bfa5cebe72707decc3831b77 (patch) | |
| tree | 82a7890895327c2497cdea0ce5427785a3d22a1b /MediaBrowser.Providers/Folders/UserViewMetadataService.cs | |
| parent | 81d3ec7205dd559e6444c17f9ecefc37977a5911 (diff) | |
| parent | 0011e8df47380936742302ef40639a4626a780ed (diff) | |
Merge remote-tracking branch 'upstream/api-migration' into api-item-update
Diffstat (limited to 'MediaBrowser.Providers/Folders/UserViewMetadataService.cs')
| -rw-r--r-- | MediaBrowser.Providers/Folders/UserViewMetadataService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Providers/Folders/UserViewMetadataService.cs b/MediaBrowser.Providers/Folders/UserViewMetadataService.cs index 60ee81114..abb78fbc7 100644 --- a/MediaBrowser.Providers/Folders/UserViewMetadataService.cs +++ b/MediaBrowser.Providers/Folders/UserViewMetadataService.cs @@ -22,7 +22,7 @@ namespace MediaBrowser.Providers.Folders } /// <inheritdoc /> - protected override void MergeData(MetadataResult<UserView> source, MetadataResult<UserView> target, MetadataFields[] lockedFields, bool replaceData, bool mergeMetadataSettings) + protected override void MergeData(MetadataResult<UserView> source, MetadataResult<UserView> target, MetadataField[] lockedFields, bool replaceData, bool mergeMetadataSettings) { ProviderUtils.MergeBaseItemData(source, target, lockedFields, replaceData, mergeMetadataSettings); } |