Merge lp:~popey/reminders-app/fix-1452924 into lp:reminders-app
Proposed by
Alan Pope πΊπ§π± π¦
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Riccardo Padovani | ||||
Approved revision: | 474 | ||||
Merged at revision: | 493 | ||||
Proposed branch: | lp:~popey/reminders-app/fix-1452924 | ||||
Merge into: | lp:reminders-app | ||||
Diff against target: |
12 lines (+1/-1) 1 file modified
src/app/qml/ui/NoteConflictView.qml (+1/-1) |
||||
To merge this branch: | bzr merge lp:~popey/reminders-app/fix-1452924 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
Riccardo Padovani | Approve | ||
Review via email: mp+271845@code.launchpad.net |
Commit message
Modify conflict resolution message
To post a comment you must log in.
Thanks, looks better