docs/html/delete-conflicts.html

changeset 275
fa48ab29abd2
parent 273
c743721d566f
child 281
ddb5e8f2a43d
--- a/docs/html/delete-conflicts.html	Fri Aug 04 20:03:21 2017 +0200
+++ b/docs/html/delete-conflicts.html	Sat Aug 05 09:36:03 2017 +0200
@@ -64,7 +64,9 @@
 
 <!-- begin content -->
 <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>
 </div>
 <!-- end content -->
 </body>

mercurial