Markus Unterwaditzer 22568571c2 Introduce conflict resolution via commands ... Fix #127 More options of conflict resolution are discussed there, but they all require extra dependencies. This new API allows the user to plug in third-party scripts to do those.		2016-09-19 19:17:39 +02:00
..
cli	Introduce conflict resolution via commands	2016-09-19 19:17:39 +02:00
storage	Remove Python 2 support (#499)	2016-09-08 12:18:36 +02:00
utils	Remove Python 2 support (#499)	2016-09-08 12:18:36 +02:00
__init__.py	Stylefixes	2016-04-26 22:44:19 +02:00
conftest.py	Remove Python 2 support (#499)	2016-09-08 12:18:36 +02:00
test_metasync.py	Stylefix for flake8 update	2016-07-26 21:48:42 +02:00
test_sync.py	Refactor of status handling in sync (#505)	2016-09-18 15:46:56 +02:00