← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

Thread
Date

Re: [Merge] lp:~mzanetti/reminders-app/qmltest2 into lp:reminders-app

To: Michael Zanetti <michael.zanetti@xxxxxxxxxxxxx>
From: Nicholas Skaggs <nskaggs@xxxxxxxxxx>
Date: Thu, 27 Aug 2015 16:44:49 -0000
In-reply-to: <20150319230321.721.76778.launchpad@ackee.canonical.com>
Reply-to: mp+253598@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Review: Needs Fixing

Text conflict in CMakeLists.txt
Text conflict in src/app/qml/Reminders.qml
Text conflict in src/app/qml/ui/EditNoteView.qml
3 conflicts encountered.
bzr: ERROR: Conflicts from merge
-- 
https://code.launchpad.net/~mzanetti/reminders-app/qmltest2/+merge/253598
Your team Ubuntu Notes app developers is subscribed to branch lp:reminders-app.

References

[Merge] lp:~mzanetti/reminders-app/qmltest2 into lp:reminders-app
From: Michael Zanetti, 2015-03-19