diff options
| author | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-06-26 10:12:22 -0400 |
|---|---|---|
| committer | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-06-26 10:12:22 -0400 |
| commit | 0e9164351b80b532b96fbf4edf98dbd483141183 (patch) | |
| tree | a0c399755abe3f32943b77422e67927d99b5120e /MediaBrowser.Providers/Folders/UserViewMetadataService.cs | |
| parent | 4f6e5591ece8d9344385d13f923384abfc07b709 (diff) | |
| parent | 57caa9fdba984d0c4813c642f2617be905205d49 (diff) | |
Merge remote-tracking branch 'upstream/master' into external-id-type
Diffstat (limited to 'MediaBrowser.Providers/Folders/UserViewMetadataService.cs')
| -rw-r--r-- | MediaBrowser.Providers/Folders/UserViewMetadataService.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/MediaBrowser.Providers/Folders/UserViewMetadataService.cs b/MediaBrowser.Providers/Folders/UserViewMetadataService.cs index 60ee81114..2d536f12e 100644 --- a/MediaBrowser.Providers/Folders/UserViewMetadataService.cs +++ b/MediaBrowser.Providers/Folders/UserViewMetadataService.cs @@ -1,3 +1,5 @@ +#pragma warning disable CS1591 + using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Library; @@ -22,7 +24,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); } |