Skip to content
Snippets Groups Projects
Commit 410ffc9b authored by Chris Smith's avatar Chris Smith
Browse files

Merged branch master into master

parents 086a3002 c5f7ab4b
No related branches found
No related tags found
1 merge request!13Pyspm port suhas
Hide whitespace changes
Inline Side-by-side
docs/conf.py
+ 1
− 1
View file @ 410ffc9b
...@@ -113,7 +113,7 @@ todo_include_todos = True ...@@ -113,7 +113,7 @@ todo_include_todos = True
# The theme to use for HTML and HTML Help pages. See the documentation for # The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes. # a list of builtin themes.
#html_theme = 'default' html_theme = 'default'
# Theme options are theme-specific and customize the look and feel of a theme # Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the # further. For a list of options available for each theme, see the
......
docs/modules.rst
+ 2
− 4
View file @ 410ffc9b
...@@ -4,7 +4,5 @@ pycroscopy ...@@ -4,7 +4,5 @@ pycroscopy
.. toctree:: .. toctree::
:maxdepth: 4 :maxdepth: 4
io pycroscopy
analysis setup
processing
viz
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment