Revision 368e06fd
| ID | 368e06fd6d45fcc2e3f9aa99c02fcd988f8f0ecb |
Added Keep Local, Keep Server conflict resolution actions
Modified ConflictsView.xaml to always display a combobox with the actions
Fixed PollAgent bug that caused false conflict reports
Modification of settings now causes a sync operation to force PollAgent to use modified poll settings
Files
- added
- modified
- copied
- renamed
- deleted