bug fix

zqfang · Feb 3, 2016 · ed7dcac · ed7dcac
1 parent 3e2d41c
commit ed7dcac
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/README.rst b/README.rst
@@ -6,6 +6,7 @@ GSEAPY: Gene Set Enrichment Analysis in Python.
 
 .. image:: https://badge.fury.io/py/gseapy.svg
     :target: https://badge.fury.io/py/gseapy
+
 .. image:: https://travis-ci.org/BioNinja/gseapy.svg?branch=master
     :target: https://travis-ci.org/BioNinja/gseapy
 

diff --git a/docs/index.rst b/docs/index.rst
@@ -35,12 +35,7 @@ The full ``GSEA`` is far too extensive to describe here; see
 
 
 .. toctree::
-<<<<<<< HEAD
     :maxdepth: 3
-=======
-   :maxdepth: 3
->>>>>>> origin/master
-
 
     introduction.rst
     run.rst