Update README.rst

ScottfreeLLC · Aug 2, 2018 · ba9f558 · ba9f558
1 parent 488f8ee
commit ba9f558
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/README.rst b/README.rst
@@ -4,11 +4,8 @@
 .. 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
 =======