From 2a08a48dd2451e3139735c8b4f29d6d2516b8eb0 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Fri, 26 Jul 2013 15:07:33 -0700
Subject: [PATCH] Version bump/dumb-fix

---
 paramiko/__init__.py | 2 +-
 setup.py             | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/paramiko/__init__.py b/paramiko/__init__.py
index d720e37..62cd51c 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)"
 
 
diff --git a/setup.py b/setup.py
index e94b902..02a71e5 100644
--- a/setup.py
+++ b/setup.py
@@ -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",