diff -r 8e7ef0675946 -r 02d3e4b1245f docs/src/resolve-conflicts.md --- a/docs/src/resolve-conflicts.md Sun Aug 06 17:02:25 2017 +0200 +++ b/docs/src/resolve-conflicts.md Sun Aug 06 18:18:00 2017 +0200 @@ -2,7 +2,7 @@ title: 'dav-sync resolve-conflicts' --- -**`resolve-conflicts `** +**`dav-sync resolve-conflicts `** 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.