1 files changed, 4 insertions, 0 deletions
diff --git a/setup.py b/setup.py
index 02a71e58..e94b9022 100644
--- a/setup.py
+++ b/setup.py
@@ -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",