added badge and fixed merge

fcollman · fcollman · commit bb78eb5e858e · 2017-07-30T13:06:42.000-07:00
diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
+[![Documentation Status](https://readthedocs.org/projects/render-python/badge/)](http://render-python.readthedocs.io/en/latest/)
+
 # render-python
 
 This is a python API client to interact with [render-webservices](https://github.com/saalfeldlab/render) and facilitate python scripting of [tilespec](https://github.com/saalfeldlab/render/blob/master/docs/src/site/markdown/data-model.md) creation
diff --git a/docs/index.rst b/docs/index.rst
@@ -12,15 +12,6 @@ Welcome to render-python's documentation!
    :maxdepth: 2
    :caption: Contents:
 
-<<<<<<< HEAD
-api
----
-.. toctree::
-   :maxdepth: 2
-
-    api/renderapi
-
-=======
 API
 ---
 
@@ -31,7 +22,6 @@ API
    guide/pointmatchassumptions
    api/renderapi
  
->>>>>>> 438b824ea8a857a55d9632f4e7705e12c2fda3f5
 
 Indices and tables
 ==================

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+[![Documentation Status](https://readthedocs.org/projects/render-python/badge/)](http://render-python.readthedocs.io/en/latest/)`
	`2`	`+`
`1`	`3`	`# render-python`
`2`	`4`
`3`	`5`	`This is a python API client to interact with [render-webservices](https://github.com/saalfeldlab/render) and facilitate python scripting of [tilespec](https://github.com/saalfeldlab/render/blob/master/docs/src/site/markdown/data-model.md) creation`