Ubuntu Clock App

Code review comment for lp:~twstd-dev/ubuntu-clock-app/next-alarm

  1. next-alarm
  2. Merge into trunk
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

What's going on here? Is the jenkins environment not clean?

Merging 'lp:ubuntu-clock-app' in to 'work'.
Not attempting to fix packaging branch ancestry, missing pristine tar data for version 3.1.
Text conflict in app/ubuntu-clock-app.qml
1 conflicts encountered.
bzr: ERROR: Conflicts from merge

« Back to merge proposal