Ubuntu Music App

Code review comment for lp:~danielholm/music-app/show-tracks-in-playlists

  1. show-tracks-in-playlists
  2. Merge into trusty
Revision history for this message
David Planella (dpm) wrote :

The "diff against target" section on the merge proposal's page highlights the issues:

Text conflict in debian/changelog
Text conflict in music-app.qml

To fix this, you'll need to:

1. do a 'bzr merge lp:music-app' to get the latest changes from trunk
2. resolve any conflicts manually
3. commit the changes locally with 'bzr commit'
4. push the changes online to update the merge proposal 'bzr push lp:~danielholm/music-app/show-tracks-in-playlists'

review: Needs Fixing

« Back to merge proposal