From ec7e84a4f7151a5de6a2777593d8e9b7e9402934 Mon Sep 17 00:00:00 2001
From: surbhi <surbhi.s@cisinlabs.com>
Date: Mon, 30 Sep 2019 19:13:18 +0530
Subject: [PATCH] resolve conflicts relevant openssl

---
 src/pyelliptic/openssl.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/pyelliptic/openssl.py b/src/pyelliptic/openssl.py
index ae50116a..d204c22d 100644
--- a/src/pyelliptic/openssl.py
+++ b/src/pyelliptic/openssl.py
@@ -654,13 +654,9 @@ class _OpenSSL:
 
 
 def loadOpenSSL():
-<<<<<<< HEAD
     """Method find and load the OpenSSL library"""
     # pylint: disable=global-statement, protected-access, too-many-branches
-=======
-    """This function finds and load the OpenSSL library"""
-    # pylint: disable=global-statement
->>>>>>> fba2d6d8375fa6968dd1a0c01354e2f7b08ce490
+
     global OpenSSL
     from os import path, environ
     from ctypes.util import find_library