> 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
merged
« Back to merge proposal
> Bah, this should work now, but: qml/components/ NoteHeader. qml qml/components/ SortingDialog. qml
>
> Merging 'lp:reminders-app' in to 'build_dir'.
> Text conflict in src/app/
> Text conflict in src/app/
merged