
Conflicts: .gitignore .travis.yml LICENSE MANIFEST.in docs/Makefile docs/conf.py docs/index.rst requirements.txt setup.py tox.ini
Conflicts: .gitignore .travis.yml LICENSE MANIFEST.in docs/Makefile docs/conf.py docs/index.rst requirements.txt setup.py tox.ini