diff -r 16d6b97fbf33 -r 12bad63cf5a8 dav/sync.h
--- a/dav/sync.h	Thu Mar 17 20:24:37 2016 +0100
+++ b/dav/sync.h	Thu Mar 17 21:11:19 2016 +0100
@@ -75,6 +75,9 @@
 int sync_delete_remote_resource(DavSession *sn, LocalResource *res, int *counter);
 
 
+int cmd_resolve_conflicts(CmdArgs *args);
+int cmd_delete_conflicts(CmdArgs *args);
+
 int cmd_trash_info(CmdArgs *args);
 int cmd_empty_trash(CmdArgs *args);
 int cmd_add_directory(CmdArgs *args);