Ubuntu Document Viewer App

Code review comment for lp:~fcole90/ubuntu-docviewer-app/ubuntu-docviewer-app

  1. ubuntu-docviewer-app
  2. Merge into trunk
Revision history for this message
fcole90 (fcole90) wrote :

David, can you help me? What does the following mean?
---
Not attempting to fix packaging branch ancestry, missing pristine tar data for version 0.1.1.
Contents conflict in ubuntu-docviewer-app.qmlproject
1 conflicts encountered.
bzr: ERROR: Conflicts from merge
---

« Back to merge proposal