Viewing all changes in revision 393.
- Committer: Tarmac
- Date: 2015-03-31 08:02:43 UTC
- mfrom: (382.2.6 reminders-app-conflicts)
- Revision ID: tarmac-20150331080243-kh6b6hifivqsd50i
implement proper conflict handling. Fixes: https://bugs.launchpad.net/bugs/1431456.
Approved by Riccardo Padovani, Ubuntu Phone Apps Jenkins Bot, Alan Pope .
Approved by Riccardo Padovani, Ubuntu Phone Apps Jenkins Bot, Alan Pope .
- files added:
- src/app/qml/components/ConflictDelegate.qml
- files modified:
- src/app/qml/components/ListItemWithActions.qml
expand all
collapse all
added
removed
