diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2013-07-26 15:06:58 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2013-07-26 15:06:58 -0700 |
| commit | d2c71ed9994baa167f7eaf26683f17a0be4b7c02 (patch) | |
| tree | 3d15d02bb16999b6f773426f82e26ccd8695173d /setup.py | |
| parent | caf94786ca8c0bc9e3995da0a160c84921a3bfc6 (diff) | |
| parent | 965d00dee951ffaee7458c7f8cb0a3c38ff46b25 (diff) | |
Merge branch '1.10'
Conflicts:
NEWS
setup.py
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -52,7 +52,11 @@ if sys.platform == 'darwin': setup(name = "paramiko", +<<<<<<< HEAD version = "1.11.0", +======= + version = "1.10.2", +>>>>>>> 1.10 description = "SSH2 protocol library", author = "Jeff Forcier", author_email = "jeff@bitprophet.org", |