fixed merge conflict in update of the docu.

2020-05-15 21:17:32 +02:00
parent c7e4664e89
commit 259423132b
29 changed files with 13657 additions and 2129 deletions
--- a/doc/html/_static/documentation_options.js
+++ b/doc/html/_static/documentation_options.js
@@ -1,6 +1,6 @@
 var DOCUMENTATION_OPTIONS = {
    URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
-    VERSION: '1.5.2',
+    VERSION: '1.6.0',
    LANGUAGE: 'None',
    COLLAPSE_INDEX: false,
    FILE_SUFFIX: '.html',