diff -r 12bad63cf5a8 -r 5f1f7602cf77 dav/sync.h --- a/dav/sync.h Thu Mar 17 21:11:19 2016 +0100 +++ b/dav/sync.h Thu Mar 17 22:02:15 2016 +0100 @@ -74,6 +74,7 @@ int sync_mkdir(SyncDirectory *dir, DavResource *res, LocalResource *local); int sync_delete_remote_resource(DavSession *sn, LocalResource *res, int *counter); +void remove_deleted_conflicts(SyncDirectory *dir, SyncDatabase *db); int cmd_resolve_conflicts(CmdArgs *args); int cmd_delete_conflicts(CmdArgs *args);