Skip to content

Commit

Permalink
merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Peter-Metz committed Aug 20, 2020
2 parents cba9b07 + af7fa89 commit a5d728c
Show file tree
Hide file tree
Showing 2 changed files with 209 additions and 209 deletions.
8 changes: 4 additions & 4 deletions docs/_toc.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- file: index
- chapter: Usage
- part: Usage
sections:
- file: usage/starting
- file: usage/overview
Expand All @@ -21,21 +21,21 @@
- file: recipes/recipe04_pandas
- file: recipes/recipe05
- file: recipes/recipe06
- chapter: About
- part: About
sections:
- file: about/history
- file: about/roadmap
- file: about/releases
- file: about/changes
- file: about/upgrading
- file: about/license
- chapter: Contributing
- part: Contributing
sections:
- file: contributing/contributor_guide
- file: contributing/pr_workflow
- file: contributing/param_naming
- file: contributing/testing
- chapter: API
- part: API
sections:
- file: api/public_api
sections:
Expand Down
Loading

0 comments on commit a5d728c

Please sign in to comment.