Merge branch 'deps'

* deps: moar deps goodness !wip fix: Travis !wip chg: tox installs root requirements.txt fix: t-CI, again !wip new: Better deps, from MishMash moar deps goodness !wip fix: Travis !wip chg: tox installs root requirements.txt fix: t-CI, again !wip new: Better deps, from MishMash
nicfit · Feb 25, 2017 · d84ed15 · d84ed15
2 parents 8d1137f + cd36bfb
commit d84ed15
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -7,6 +7,12 @@ Sphinx==1.5.2
 check-manifest==0.35
 #gitchangelog
 git+https://github.com/nicfit/gitchangelog.git
+<<<<<<< HEAD
 ipdb==0.10.2
 babel==2.3.4
 pip-tools==1.8.0
+=======
+ipdb
+babel
+pip-tools
+>>>>>>> deps