Skip to content

Commit 911cea0

Browse files
Merge branch 'master' into resolve-conflict
2 parents 85b9498 + 008c6d8 commit 911cea0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+2237
-345
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,6 @@ var/
1717
*.egg-info/
1818
.installed.cfg
1919
*.egg
20-
docs_build/
20+
docs_build/
21+
docs/html/
22+
docs/doctrees/

0 commit comments

Comments
 (0)