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
« Back to merge proposal
Merging 'lp:ubuntu-docviewer-app/reboot' in to 'build_dir'. ubuntu. docviewer. pot
Text conflict in po/com.
1 conflicts encountered.
bzr: ERROR: Conflicts from merge