diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2020-06-13 16:28:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-13 16:28:37 -0400 |
| commit | 0011e8df47380936742302ef40639a4626a780ed (patch) | |
| tree | b286c590e9d1dbc00cf1acbf8e50f90713e8faf8 /MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs | |
| parent | d975ad155e7857bcbfcf55246fd78dd87ed594ca (diff) | |
| parent | ec3e15db5789b6218482beb488433f41f9a0d8ba (diff) | |
Merge pull request #3332 from crobibero/api-migration
Merge master into api-migration
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); |