| commit | 6d950d23a89f5d387cf0f8c221a223a2c3ec8b48 | [log] [tgz] |
|---|---|---|
| author | Rushabh Mehta <rmehta@gmail.com> | Fri Nov 28 12:08:51 2014 +0530 |
| committer | Rushabh Mehta <rmehta@gmail.com> | Fri Nov 28 12:08:51 2014 +0530 |
| tree | 4d5f0c89eedeaabcabaaeb0c214e448d6e351e46 | |
| parent | bd9b62ff2861f37a34b23f6ad339452d8ffed8a6 [diff] [blame] | |
| parent | 7c82d616c981395addcddb2bcb4eadadf3d4e6ee [diff] [blame] |
[merge]
diff --git a/setup.py b/setup.py index be7f892..bd4adc6 100644 --- a/setup.py +++ b/setup.py
@@ -1,6 +1,10 @@ from setuptools import setup, find_packages +<<<<<<< HEAD version = "5.0.0-alpha" +======= +version = "4.12.0" +>>>>>>> upstream/develop with open("requirements.txt", "r") as f: install_requires = f.readlines()