Bitmessage/PyBitmessage-2024-12-09
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

resolve conflicts relevant openssl

Browse Source
This commit is contained in:
surbhi 2019-09-30 19:13:18 +05:30
parent 72f780989b
commit ec7e84a4f7
No known key found for this signature in database
GPG Key ID: 88928762974D3618
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pyelliptic/openssl.py
View File

@ -654,13 +654,9 @@ class _OpenSSL:
def loadOpenSSL(): def loadOpenSSL():
<<<<<<< HEAD
"""Method find and load the OpenSSL library""" """Method find and load the OpenSSL library"""
# pylint: disable=global-statement, protected-access, too-many-branches # pylint: disable=global-statement, protected-access, too-many-branches
=======
"""This function finds and load the OpenSSL library"""
# pylint: disable=global-statement
>>>>>>> fba2d6d8375fa6968dd1a0c01354e2f7b08ce490
global OpenSSL global OpenSSL
from os import path, environ from os import path, environ
from ctypes.util import find_library from ctypes.util import find_library