diff -r 3070d72f54af -r 0e36bb75a732 docs/html/delete-conflicts.html --- a/docs/html/delete-conflicts.html Sat Aug 05 13:35:27 2017 +0200 +++ b/docs/html/delete-conflicts.html Sun Aug 06 14:41:20 2017 +0200 @@ -4,7 +4,7 @@ - + dav-sync delete-conflicts @@ -64,7 +64,9 @@
-

dav-sync delete-conflicts

+

delete-conflicts <directory>

Deletes all files that are marked as a conflict. This will always delete the files and does not move them to the trash directory.