[Syncevolution-issues] [Bug 1364] New: SyncML server: conflict resolution