From b1e67f241e64137077215f4f432995ae10439006 Mon Sep 17 00:00:00 2001
From: Brad Warren <bradmw@umich.edu>
Date: Fri, 8 Jan 2016 14:31:30 -0500
Subject: [PATCH] Fix merge conflicts properly

---
 acme/setup.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/acme/setup.py b/acme/setup.py
index 82a08b6ef..c10c95546 100644
--- a/acme/setup.py
+++ b/acme/setup.py
@@ -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',