Version bump/dumb-fix

rakeshJn · Jul 26, 2013 · 2a08a48 · 2a08a48
1 parent d2c71ed
commit 2a08a48
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/paramiko/__init__.py b/paramiko/__init__.py
@@ -57,7 +57,7 @@
 
 
 __author__ = "Jeff Forcier <[email protected]>"
-__version__ = "1.10.2"
+__version__ = "1.11.0"
 __license__ = "GNU Lesser General Public License (LGPL)"
 
 

diff --git a/setup.py b/setup.py
@@ -52,11 +52,7 @@
 
 
 setup(name = "paramiko",
-<<<<<<< HEAD
       version = "1.11.0",
-=======
-      version = "1.10.2",
->>>>>>> 1.10
       description = "SSH2 protocol library",
       author = "Jeff Forcier",
       author_email = "[email protected]",