3 commits

Author	SHA1	Message	Date
Bernhard Reiter	61edfc090e	Adjust codestyle ... running flake8, black and reorder-python-imports.	2021-06-28 16:01:21 +02:00
Bernhard Reiter	b3bee77c17	Change license from Apache-2.0 to BSD-3-Clause ... to match the license of vdirsyncer	2021-06-28 15:22:56 +02:00
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