ubuntu-touch-coreapps-reviewers team mailing list archive

[Niklas Wenzel <nikwen.developer@xxxxxxxxx>]

Merge conflict...

Retrieving 'bzr+ssh://ubuntu-phone-apps-jenkins-bot@xxxxxxxxxxxxxxxxxxxx/~gang65/ubuntu-calculator-app/ubuntu-calculator-app-translation-template-fix' to put at 'work'.
Merging 'lp:ubuntu-calculator-app' in to 'work'.
Not attempting to fix packaging branch ancestry, missing pristine tar data for version 0.1.
Text conflict in po/com.ubuntu.calculator.pot
1 conflicts encountered.
bzr: ERROR: Conflicts from merge
-- 
https://code.launchpad.net/~gang65/ubuntu-calculator-app/ubuntu-calculator-app-translation-template-fix/+merge/262064
Your team Ubuntu Calculator Developers is subscribed to branch lp:ubuntu-calculator-app.