diff -r 8e7ef0675946 -r 02d3e4b1245f docs/html/resolve-conflicts.html --- a/docs/html/resolve-conflicts.html Sun Aug 06 17:02:25 2017 +0200 +++ b/docs/html/resolve-conflicts.html Sun Aug 06 18:18:00 2017 +0200 @@ -10,7 +10,7 @@
- davutils documentation + DavUtils documentation
@@ -67,7 +67,7 @@ -

resolve-conflicts <directory>

+

dav-sync resolve-conflicts <directory>

Removes conflict entries from the database. This does not merge any files. All files which are marked as conflict are normal files after running this command. In other words: by executing this command you assert that you have resolved the conflicts.