Bernhard Reiter 95bf683771 Add contrib script to resolve conflicts ... Asks the user when two iCalender objects conflict during a sync, which one to take.		2021-06-11 16:50:00 +02:00
..
conflict_resolution	Add contrib script to resolve conflicts	2021-06-11 16:50:00 +02:00
vdirsyncer.plist	Initial MacOS X launchd .plist file. (#435)	2016-04-25 21:57:15 +02:00
vdirsyncer.service	contrib/systemd: extend timeout to 3 mins	2020-10-04 22:08:41 +02:00
vdirsyncer.timer	Add systemd.timer files and a relevant tutorial (#635)	2017-05-24 22:38:42 +02:00