Corrected merge conflict in requirements.txt

sundayguru · May 12, 2016 · 5876629 · 5876629
1 parent 902a586
commit 5876629
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -3,7 +3,4 @@ coveralls==1.1
 docopt==0.6.2
 nose==1.3.7
 requests==2.10.0
-<<<<<<< HEAD
 tabulate==0.7.5
-=======
->>>>>>> d1f16c7447649d64d259929ee238d3de12218374