fixed merge conflicts

harpolea · harpolea · commit 821038c881b1 · 2018-11-01T16:40:00.000-04:00
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.com/python-hydro/pyro2.svg?branch=master)](https://travis-ci.com/python-hydro/pyro2)
+[![Build Status](https://travis-ci.com/python-hydro/pyro2.svg?branch=master)](https://travis-ci.com/python-hydro/pyro2) [![Documentation Status](https://readthedocs.org/projects/pyro2/badge/?version=latest)](https://pyro2.readthedocs.io/en/latest/?badge=latest)
 
 ![pyro logo](www/logo.gif)
 
diff --git a/requirements.txt b/requirements.txt
@@ -10,3 +10,4 @@ nbval>=0.9.0
 pytest-cov>=2.5.1
 flake8>=3.5.0
 numba>=0.40.0
+numpydoc

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-[![Build Status](https://travis-ci.com/python-hydro/pyro2.svg?branch=master)](https://travis-ci.com/python-hydro/pyro2)`
	`1`	`+[![Build Status](https://travis-ci.com/python-hydro/pyro2.svg?branch=master)](https://travis-ci.com/python-hydro/pyro2) [![Documentation Status](https://readthedocs.org/projects/pyro2/badge/?version=latest)](https://pyro2.readthedocs.io/en/latest/?badge=latest)`
`2`	`2`
`3`	`3`	`![pyro logo](www/logo.gif)`
`4`	`4`