upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-03 22:08:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix merge conflicts properly

Browse source
This commit is contained in:
Brad Warren 2016-01-08 14:31:30 -05:00
parent 36679c2daa
commit b1e67f241e
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
acme/setup.py
View file

@ -10,7 +10,6 @@ version = '0.2.0.dev0'
install_requires = [
# load_pem_private/public_key (>=0.6)
# rsa_recover_prime_factors (>=0.8)
<<<<<<< HEAD
'cryptography>=0.8,<1.2',
# Connection.set_tlsext_host_name (>=0.13)
'PyOpenSSL>=0.13',