fix merge conflict

2015-12-28 16:10:51 -05:00 · 2015-12-28 16:10:51 -05:00 · 309710c1aa
commit 309710c1aa
parent ef644ca8a9
1 changed files with 1 additions and 1 deletions
--- 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();