Initial rebuild

GRIDAPPSD · May 25, 2021 · 71fabe7 · 71fabe7
1 parent be6082e
commit 71fabe7
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -34,10 +34,6 @@
 extensions = [
     'nbsphinx',
     'sphinx.ext.autodoc',
-<<<<<<< Updated upstream
-    # 'javasphinx',
-=======
->>>>>>> Stashed changes
     'sphinx.ext.intersphinx',
     'sphinx.ext.todo',
     'sphinx.ext.coverage',