Skip to content

Commit b0d0963

Browse files
committed
resolve conflict
2 parents fd67a8b + 3ba0314 commit b0d0963

20 files changed

+1
-14348
lines changed

docs/static/documentation_options.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var DOCUMENTATION_OPTIONS = {
22
URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
3-
VERSION: '1.0.0',
3+
VERSION: '1.0.1',
44
LANGUAGE: 'None',
55
COLLAPSE_INDEX: false,
66
FILE_SUFFIX: '.html',

sources/analysis.rst.txt

Lines changed: 0 additions & 5 deletions
This file was deleted.

sources/content.rst.txt

Lines changed: 0 additions & 5 deletions
This file was deleted.

sources/index.rst.txt

Lines changed: 0 additions & 32 deletions
This file was deleted.

sources/utils.rst.txt

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)