← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

Thread
Date

Re: [Merge] lp:~vthompson/music-app/fix-1378143 into lp:music-app

To: mp+284380@xxxxxxxxxxxxxxxxxx
From: Andrew Hayzen <ahayzen@xxxxxxxxx>
Date: Sun, 21 Feb 2016 15:50:50 -0000
In-reply-to: <20160129022420.5863.96698.launchpad@ackee.canonical.com>
Reply-to: mp+284380@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Retrieving 'lp:~vthompson/music-app/fix-1378143' to put at 'build_dir'.
Merging 'lp:music-app' in to 'build_dir'.
Text conflict in debian/changelog
1 conflicts encountered.
bzr: ERROR: Conflicts from merge
-- 
https://code.launchpad.net/~vthompson/music-app/fix-1378143/+merge/284380
Your team Music App Developers is subscribed to branch lp:music-app.

References

[Merge] lp:~vthompson/music-app/fix-1378143 into lp:music-app
From: Victor Thompson, 2016-01-29