diff options
| author | crobibero <cody@robibe.ro> | 2020-06-13 15:03:43 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-06-13 15:03:43 -0600 |
| commit | 7666a1201fe1f9e6e7b896dd58e98e9cc75b90c4 (patch) | |
| tree | 7db808fe59b61ff6ce7709e0ba4dcd98cd5fa9bb /MediaBrowser.Providers/Users/UserMetadataService.cs | |
| parent | aed6f57f11e4d08372fcf456742bdaedea374f6d (diff) | |
| parent | 0011e8df47380936742302ef40639a4626a780ed (diff) | |
Merge remote-tracking branch 'upstream/api-migration' into api-display-preferences
Diffstat (limited to 'MediaBrowser.Providers/Users/UserMetadataService.cs')
| -rw-r--r-- | MediaBrowser.Providers/Users/UserMetadataService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Providers/Users/UserMetadataService.cs b/MediaBrowser.Providers/Users/UserMetadataService.cs index fb6c91b6c..ad4d315f5 100644 --- a/MediaBrowser.Providers/Users/UserMetadataService.cs +++ b/MediaBrowser.Providers/Users/UserMetadataService.cs @@ -22,7 +22,7 @@ namespace MediaBrowser.Providers.Users } /// <inheritdoc /> - protected override void MergeData(MetadataResult<User> source, MetadataResult<User> target, MetadataFields[] lockedFields, bool replaceData, bool mergeMetadataSettings) + protected override void MergeData(MetadataResult<User> source, MetadataResult<User> target, MetadataField[] lockedFields, bool replaceData, bool mergeMetadataSettings) { ProviderUtils.MergeBaseItemData(source, target, lockedFields, replaceData, mergeMetadataSettings); } |