Merge branch 'master' of https://github.com/ScottFreeLLC/AlphaPy

ScottfreeLLC · Aug 2, 2018 · 488f8ee · 488f8ee
2 parents b4c7ad6 + f1da6bf
commit 488f8ee
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/README.rst b/README.rst
@@ -4,8 +4,11 @@
 .. image:: https://travis-ci.org/ScottFreeLLC/AlphaPy.svg?branch=master
 
 .. image:: https://readthedocs.org/projects/alphapy/badge/?version=latest
+<<<<<<< HEAD
     :target: https://alphapy.readthedocs.io/en/latest/?badge=latest
     :alt: Documentation Status
+=======
+>>>>>>> f1da6bf1bf09561b68a39a1f9d7a18131765ad88
 
 AlphaPy
 =======