You'll need to manually resolve the merge conflicts in MusicAlbums.qml. I'll try to test with how I assume you'll resolve them.
« Back to merge proposal
You'll need to manually resolve the merge conflicts in MusicAlbums.qml. I'll try to test with how I assume you'll resolve them.