forked from ondra/colnod-connector
# Conflicts: # src/colnod/databaseapi.cpp # src/colnod/databaseapi.h # src/colnod/syncmanager.cpp # src/colnod/syncmanager.h # test/auto/colnod/tst_colnodapi.cpp # test/auto/syncmanager/tst_syncmanager.cpp
# Conflicts: # src/colnod/databaseapi.cpp # src/colnod/databaseapi.h # src/colnod/syncmanager.cpp # src/colnod/syncmanager.h # test/auto/colnod/tst_colnodapi.cpp # test/auto/syncmanager/tst_syncmanager.cpp