ubuntu-touch-coreapps-reviewers team mailing list archive

Thread
Date

Re: [Merge] lp:~verzegnassi-stefano/ubuntu-docviewer-app/new-empty-state into lp:ubuntu-docviewer-app

To: Stefano Verzegnassi <stefano92.100@xxxxxxxxx>
From: Alan Pope  <alan@xxxxxxxxxx>
Date: Tue, 02 Feb 2016 01:58:16 -0000
In-reply-to: <20160125130849.2006.89460.launchpad@ackee.canonical.com>
Reply-to: mp+283802@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Review: Needs Fixing

Text conflict...

Building tree.
Retrieving 'lp:~verzegnassi-stefano/ubuntu-docviewer-app/new-empty-state' to put at 'build_dir'.
Merging 'lp:ubuntu-docviewer-app/reboot' in to 'build_dir'.
Text conflict in po/com.ubuntu.docviewer.pot
1 conflicts encountered.
bzr: ERROR: Conflicts from merge
Build step 'Execute shell' marked build as failure
-- 
https://code.launchpad.net/~verzegnassi-stefano/ubuntu-docviewer-app/new-empty-state/+merge/283802
Your team Ubuntu Document Viewer Developers is subscribed to branch lp:ubuntu-docviewer-app.

References

[Merge] lp:~verzegnassi-stefano/ubuntu-docviewer-app/new-empty-state into lp:ubuntu-docviewer-app
From: Stefano Verzegnassi, 2016-01-25