Code review comment for lp:~fazerlicourice/music-app/test-empty-library

Also, you'll need to resolve the merge conflict in the debian/changelog file. We get such conflicts frequently as multiple people work to propose merges.

To fix, do the following:

$ bzr merge lp:music-app

Then, fix the conflict in the debian/changelog and save it. Then run:

$ bzr resolve debian/changelog

From there just commit and push the changes as usual.