Merge lp:~popey/reminders-app/fix-1452924 into lp:reminders-app

[Alan Pope 🍺🐧🐱 🦄]

Modify conflict resolution message

[Riccardo Padovani (rpadovani)]

Thanks, looks better

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'src/app/qml/ui/NoteConflictView.qml'
--- src/app/qml/ui/NoteConflictView.qml	2015-09-15 14:50:55 +0000
+++ src/app/qml/ui/NoteConflictView.qml	2015-09-21 17:33:23 +0000
@@ -51,7 +51,7 @@
                     name: "weather-severe-alert-symbolic"
                 }
                 Label {
-                    text: i18n.tr("This note has been modified in multiple places. Please choose the version to be opened and delete the other.")
+                    text: i18n.tr("This note has been modified in multiple places. Open each version to check the content, then swipe to delete one of them.")
                     Layout.fillWidth: true
                     wrapMode: Text.WordWrap
                 }