--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/html/resolve-conflicts.html Thu Aug 03 18:29:00 2017 +0200
@@ -0,0 +1,71 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="generator" content="pandoc" />
+ <title></title>
+ <style type="text/css">code{white-space: pre;}</style>
+ <link rel="stylesheet" href="davdoc.css" type="text/css" />
+</head>
+<body>
+<div class="header">
+ <span>davutils documentation</span>
+</div>
+<div class="sidebar">
+ <div class="nav">
+ <h3>dav</h3>
+ <ul>
+ <li><a href="getting-started.html">Getting started</a></li>
+ <li><a href="commands.html">Commands</a></li>
+ <ul>
+ <li><a href="list.html">list</a></li>
+ <li><a href="get.html">get</a></li>
+ <li><a href="put.html">put</a></li>
+ <li><a href="mkdir.html">mkdir</a></li>
+ <li><a href="remove.html">remove</a></li>
+ <li><a href="copy.html">copy</a></li>
+ <li><a href="move.html">move</a></li>
+ <li><a href="get-property.html">get-property</a></li>
+ <li><a href="set-property.html">set-property</a></li>
+ <li><a href="lock.html">lock</a></li>
+ <li><a href="unlock.html">unlock</a></li>
+ <li><a href="info.html">info</a></li>
+ <li><a href="date.html">date</a></li>
+ <li><a href="add-repository.html">add-repository</a></li>
+ <li><a href="list-repositories.html">list-repositories</a></li>
+ <li><a href="check-config.html">check-config</a></li>
+ </ul>
+ <li><a href="configuration.html">Configuration</a></li>
+ <li><a href="encryption.html">Encryption</a></li>
+ </ul>
+ </div>
+ <div class="nav">
+ <h3>dav-sync</h3>
+ <ul>
+ <li><a href="introduction.html">Introduction</a></li>
+ <li><a href="sync-commands.html">Commands</a></li>
+ <ul>
+ <li><a href="pull.html">pull</a></li>
+ <li><a href="push.html">push</a></li>
+ <li><a href="resolve-conflicts.html">resolve-conflicts</a></li>
+ <li><a href="delete-conflicts.html">delete-conflicts</a></li>
+ <li><a href="trash-info.html">trash-info</a></li>
+ <li><a href="empty-trash.html">empty-trash</a></li>
+ <li><a href="add-directory.html">add-directory</a></li>
+ <li><a href="list-directories.html">list-directories</a></li>
+ <li><a href="sync-check-config.html">check-config</a></li>
+ <li><a href="check-repositories.html">check-repositories</a></li>
+ </ul>
+ <li><a href="sync-configuration.html">Configuration</a></li>
+ </ul>
+ </div>
+</div>
+
+<!-- begin content -->
+<div class="content">
+
+</div>
+<!-- end content -->
+</body>
+</html>