alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-15 02:33:33 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

consolidate emby.server.core into emby.server.implementations

Browse Source
This commit is contained in:
Luke Pulverenti
2017-08-09 15:56:38 -04:00
parent 52aeb3c40b
commit 40442f887b
277 changed files with 1064 additions and 14222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs
View File

@@ -35,7 +35,7 @@ namespace MediaBrowser.Providers.BoxSets
return updateType;
}
protected override void MergeData(MetadataResult<BoxSet> source, MetadataResult<BoxSet> target, List<MetadataFields> lockedFields, bool replaceData, bool mergeMetadataSettings)
protected override void MergeData(MetadataResult<BoxSet> source, MetadataResult<BoxSet> target, MetadataFields[] lockedFields, bool replaceData, bool mergeMetadataSettings)
{
ProviderUtils.MergeBaseItemData(source, target, lockedFields, replaceData, mergeMetadataSettings);