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.

-- 
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help   : https://help.launchpad.net/ListHelp

Reply via email to