Revision 0891b0c0
b/setup.py | ||
---|---|---|
44 | 44 |
'progress>=1.0.2'] |
45 | 45 |
requires = ['objpool'] |
46 | 46 |
|
47 |
<<<<<<< HEAD |
|
48 |
======= |
|
49 | 47 |
if version_info < (2, 7): |
50 | 48 |
requires.append('argparse') |
51 | 49 |
|
52 |
>>>>>>> develop |
|
53 | 50 |
setup( |
54 | 51 |
name='kamaki', |
55 | 52 |
version=kamaki.__version__, |
Also available in: Unified diff