--- 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 @@ </head> <body> <div class="header"> - <span>davutils documentation</span> + <a href="./index.html"><span>DavUtils documentation</span></a> </div> <div class="sidebar"> <div class="nav"> @@ -67,7 +67,7 @@ <div id="header"> <h1 class="title">dav-sync resolve-conflicts</h1> </div> -<p><strong><code>resolve-conflicts <directory></code></strong></p> +<p><strong><code>dav-sync resolve-conflicts <directory></code></strong></p> <p>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 <em>you</em> have resolved the conflicts.</p> </div> <!-- end content -->