commit 06bbba1ee28935c0e644e6ff4150264c210ce038
author Jim Shaver <dcypherd@gmail.com> Mon Apr 27 00:07:54 2015 -0400
committer Jim Shaver <dcypherd@gmail.com> Wed May 27 17:36:46 2015 -0400
tree 601e5e2839f23522ea107e6a7d6992d4e5358983
parent b296792a182e8897d40dacff4c512eb21d956a6b

Type a removing space from merge

setup.py

diff --git a/setup.py b/setup.py
index 3f1dbf2..74efee9 100755
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,4 @@
+
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
@@ -96,7 +97,6 @@
         'Topic :: Security :: Cryptography',
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Topic :: System :: Networking',
-<<<<<<< HEAD
     ],
 
     packages=['OpenSSL'],
@@ -126,14 +126,3 @@
         "test": PyTest,
     }
 )
-=======
-        ],
-      test_suite="OpenSSL",
-      tests_require=[
-          "pytest",
-      ],
-      cmdclass={
-          "test": PyTest,
-      })
-
->>>>>>> switch to SSL_get_version.