ubuntu-touch-coreapps-reviewers team mailing list archive

Thread
Date

Re: [Merge] lp:~mcintire-evan/ubuntu-terminal-app/disable-paste into lp:ubuntu-terminal-app

To: Evan McIntire <mcintire.evan@xxxxxxxxx>
From: Niklas Wenzel <nikwen.developer@xxxxxxxxx>
Date: Sat, 06 Feb 2016 19:00:07 -0000
In-reply-to: <20160120015622.32149.94327.launchpad@ackee.canonical.com>
Reply-to: mp+283244@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Merging 'lp:ubuntu-terminal-app' in to 'build_dir'.
Text conflict in po/com.ubuntu.terminal.pot
1 conflicts encountered.
bzr: ERROR: Conflicts from merge


Looks like the pot file merge conflict we've been talking about. Try the command I posted above. ;)
-- 
https://code.launchpad.net/~mcintire-evan/ubuntu-terminal-app/disable-paste/+merge/283244
Your team Ubuntu Terminal Developers is subscribed to branch lp:ubuntu-terminal-app.

References

[Merge] lp:~mcintire-evan/ubuntu-terminal-app/disable-paste into lp:ubuntu-terminal-app
From: Evan McIntire, 2016-01-20