diff -r 8e7ef0675946 -r 02d3e4b1245f docs/html/delete-conflicts.html --- a/docs/html/delete-conflicts.html Sun Aug 06 17:02:25 2017 +0200 +++ b/docs/html/delete-conflicts.html Sun Aug 06 18:18:00 2017 +0200 @@ -10,7 +10,7 @@
delete-conflicts <directory>
dav-sync 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.