Code review comment for lp://staging/~anthonywong/music-app/fix-typo

Unfortunately, it looks like there's a conflict in the pot file that needs to be resolved. Sorry for the extra work involved here. To resolve this please do the following (from your branch's directory):

bzr merge lp:music-app
<edit po/com.ubuntu.music.pot to remove the conflicting information around "POT-Creation-Data">
bzr resolve po/com.ubuntu.music.pot
bzr commit -m "Resolved merge conflicts"
bzr push lp:~anthonywong/music-app/fix-typo