diff options
| -rw-r--r-- | paramiko/__init__.py | 2 | ||||
| -rw-r--r-- | setup.py | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/paramiko/__init__.py b/paramiko/__init__.py index d720e37e..62cd51ce 100644 --- a/paramiko/__init__.py +++ b/paramiko/__init__.py @@ -57,7 +57,7 @@ if sys.version_info < (2, 5): __author__ = "Jeff Forcier <jeff@bitprophet.org>" -__version__ = "1.10.2" +__version__ = "1.11.0" __license__ = "GNU Lesser General Public License (LGPL)" @@ -52,11 +52,7 @@ 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", |