Commit 97df49f7 authored by Avi Vajpeyi's avatar Avi Vajpeyi 👽
Browse files

Merge branch 'v1.1.0' into 'master'

V1.1.0

See merge request !124
parents b8facc29 e2c4e116
Pipeline #450356 passed with stages
in 6 minutes and 15 seconds
......@@ -13,7 +13,6 @@
import os
import sys
import parallel_bilby
sys.path.insert(0, os.path.abspath("../parallel_bilby/"))
sys.path.insert(0, os.path.abspath("../examples/"))
......@@ -67,14 +66,6 @@ html_logo = "_static/logo.png"
html_favicon = "_static/favicon.ico"
html_theme_options = {
<<<<<<< HEAD
'logo_only': True,
'display_version': True,
'vcs_pageview_mode': 'display_gitlab',
'style_nav_header_background': '#343131'
}
=======
"logo_only": True,
"style_nav_header_background": "#343131",
}
>>>>>>> lscsoft/master
Supports Markdown
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