fix merge conflict
This commit is contained in:
parent
ef644ca8a9
commit
309710c1aa
|
@ -1038,7 +1038,7 @@ namespace MediaBrowser.Providers.Manager
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
var musicArtists = albums
|
var musicArtists = albums
|
||||||
.Select(i => i.GetParent())
|
.Select(i => i.Parent)
|
||||||
.OfType<MusicArtist>()
|
.OfType<MusicArtist>()
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user