diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-28 16:10:51 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-28 16:10:51 -0500 |
| commit | 309710c1aa98b2b6b07d0212595bbe32e96c9617 (patch) | |
| tree | 678cce2be5188bb98483511a0cd17ff7625bb2d4 | |
| parent | ef644ca8a973865e29322ce5451d7688f1de0adb (diff) | |
fix merge conflict
| -rw-r--r-- | MediaBrowser.Providers/Manager/ProviderManager.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs index 477ff167c..580e9c4ac 100644 --- a/MediaBrowser.Providers/Manager/ProviderManager.cs +++ b/MediaBrowser.Providers/Manager/ProviderManager.cs @@ -1038,7 +1038,7 @@ namespace MediaBrowser.Providers.Manager .ToList(); var musicArtists = albums - .Select(i => i.GetParent()) + .Select(i => i.Parent) .OfType<MusicArtist>() .ToList(); |