--- 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 @@ <div class="content"> <h1 id="dav-sync-delete-conflicts">dav-sync delete-conflicts</h1> <p><strong><code>delete-conflicts <directory></code></strong></p> -<p>Deletes all files that are marked as a conflict. This will always delete files and does not move them to the trash directory.</p> +<p>Deletes all files that are marked as a conflict. This will always delete the files and does not move them to the trash directory.</p> </div> <!-- end content --> </body>