docs/html/delete-conflicts.html

changeset 281
ddb5e8f2a43d
parent 275
fa48ab29abd2
child 283
0e36bb75a732
--- 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 &lt;directory&gt;</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>

mercurial