ubuntu-touch-coreapps-reviewers team mailing list archive

Thread
Date

Re: [Merge] lp:~verzegnassi-stefano/ubuntu-docviewer-app/desktop-support into lp:ubuntu-docviewer-app

To: Stefano Verzegnassi <stefano92.100@xxxxxxxxx>
From: Nicholas Skaggs <nskaggs@xxxxxxxxxx>
Date: Tue, 02 Feb 2016 22:45:19 -0000
In-reply-to: <20160114174909.30411.63094.launchpad@ackee.canonical.com>
Reply-to: mp+282639@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Review: Needs Fixing

Text conflict in po/com.ubuntu.docviewer.pot
Conflict adding file po/ja.po.  Moved existing file to po/ja.po.moved.
Conflict adding file po/ro.po.  Moved existing file to po/ro.po.moved.
Text conflict in src/app/qml/loView/LOViewPage.qml
Text conflict in src/app/qml/pdfView/PdfView.qml
5 conflicts encountered.
bzr: ERROR: Conflicts from merge
-- 
https://code.launchpad.net/~verzegnassi-stefano/ubuntu-docviewer-app/desktop-support/+merge/282639
Your team Ubuntu Document Viewer Developers is subscribed to branch lp:ubuntu-docviewer-app.