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

ScottfreeLLC · Sep 16, 2018 · ae09b27 · ae09b27
2 parents f298177 + eec5ba3
commit ae09b27
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/README.rst b/README.rst
@@ -71,7 +71,7 @@ http://github.com/ScottfreeLLC/AlphaPy/issues
 
 Follow us on Twitter:
 
-https://twitter.com/scottfreellc?lang=en
+https://twitter.com/_AlphaPy_?lang=en
 
 Donations
 ---------
@@ -83,4 +83,8 @@ http://alphapy.readthedocs.io/en/latest/introduction/support.html#donations
 
 .. |badge_pypi| image:: https://badge.fury.io/py/alphapy.svg
 .. |badge_build| image:: https://travis-ci.org/ScottfreeLLC/AlphaPy.svg?branch=master
-.. |badge_docs| image:: https://readthedocs.org/projects/alphapy/badge/?version=latest
+<<<<<<< HEAD
+.. |badge_docs| image:: https://readthedocs.org/projects/alphapy/badge/?version=latest
+=======
+.. |badge_docs| image:: https://readthedocs.org/projects/alphapy/badge/?version=latest
+>>>>>>> eec5ba3919152c161e4f8acd3aa25dab0b89c6cf