Ubuntu Terminal App

Code review comment for lp:~mcintire-evan/ubuntu-terminal-app/disable-paste

  1. disable-paste
  2. Merge into reboot
Revision history for this message
Niklas Wenzel (nikwen) wrote :

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. ;)

« Back to merge proposal