Skip to content
Snippets Groups Projects
Commit 4715d680 authored by MoritzThomasHuebner's avatar MoritzThomasHuebner
Browse files

Merge remote-tracking branch 'origin/master' into 207-pep8-imports 

# Conflicts:
#	bilby/core/prior.py
#	bilby/core/result.py
#	bilby/core/sampler/cpnest.py
#	bilby/core/sampler/emcee.py
#	bilby/core/sampler/pymc3.py
#	bilby/gw/prior.py
parents ad176934 d2797b95
No related branches found
No related tags found
1 merge request!230Resolve "PEP8 Imports"
Pipeline #35721 failed
Stage: test
Hide whitespace changes
Inline Side-by-side
Showing
with 390 additions and 189 deletions
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