fix merge conflict

This commit is contained in:
Luke Pulverenti 2015-12-28 16:10:51 -05:00
parent ef644ca8a9
commit 309710c1aa

View File

@ -1038,7 +1038,7 @@ namespace MediaBrowser.Providers.Manager
.ToList();
var musicArtists = albums
.Select(i => i.GetParent())
.Select(i => i.Parent)
.OfType<MusicArtist>()
.ToList();