Bah, this should work now, but:
Merging 'lp:reminders-app' in to 'build_dir'. Text conflict in src/app/qml/components/NoteHeader.qml Text conflict in src/app/qml/components/SortingDialog.qml
« Back to merge proposal
Bah, this should work now, but:
Merging 'lp:reminders-app' in to 'build_dir'. qml/components/ NoteHeader. qml qml/components/ SortingDialog. qml
Text conflict in src/app/
Text conflict in src/app/