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
..
resolve_interactively.py	Add contrib script to resolve conflicts	2021-06-11 16:50:00 +02:00