diff options
| author | Max Git <rotvel@gmail.com> | 2020-06-11 14:50:29 +0200 |
|---|---|---|
| committer | Max Git <rotvel@gmail.com> | 2020-06-11 14:50:29 +0200 |
| commit | 620a1a106d6ecb824c1b52703013cd87413b0297 (patch) | |
| tree | 64e6e5616fe045aa837a8b3c6c1c3d5c33035e7e /MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs | |
| parent | 268e87bbf27a724edd9ea665619563729998aba9 (diff) | |
| parent | 55610f83597e668854e6022cd9d3a60d14cb0623 (diff) | |
Merge branch 'master' into feature/ffmpeg-version-check
Diffstat (limited to 'MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs')
| -rw-r--r-- | MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs b/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs index 3c9760ea7..46c9d6720 100644 --- a/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs +++ b/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs @@ -43,7 +43,7 @@ namespace MediaBrowser.Providers.BoxSets } /// <inheritdoc /> - protected override void MergeData(MetadataResult<BoxSet> source, MetadataResult<BoxSet> target, MetadataFields[] lockedFields, bool replaceData, bool mergeMetadataSettings) + protected override void MergeData(MetadataResult<BoxSet> source, MetadataResult<BoxSet> target, MetadataField[] lockedFields, bool replaceData, bool mergeMetadataSettings) { ProviderUtils.MergeBaseItemData(source, target, lockedFields, replaceData, mergeMetadataSettings); |