diff -r 6d8784bee427 -r ddb5e8f2a43d docs/html/delete-conflicts.html --- a/docs/html/delete-conflicts.html Sat Aug 05 11:08:34 2017 +0200 +++ b/docs/html/delete-conflicts.html Sat Aug 05 11:33:17 2017 +0200 @@ -66,7 +66,7 @@

dav-sync delete-conflicts

delete-conflicts <directory>

-

Deletes all files that are marked as a conflict. This will always delete files and does not move them to the trash 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.