Fixing more conflicts

letsencrypt/client.py

@@ -195,7 +195,7 @@ class Client(object):
         else:
             self.auth_handler = None
 
-    def _obtain_certificate(self, domains, csr, authzr,
+    def obtain_certificate_from_csr(self, domains, csr, authzr,
         typ=OpenSSL.crypto.FILETYPE_ASN1):
         """Obtain certificate.
 
@@ -228,30 +228,6 @@ class Client(object):
             authzr)
         return certr, self.acme.fetch_chain(certr)
 
-<<<<<<< HEAD
-=======
-    def obtain_certificate_from_csr(self, csr):
-        """Obtain certficiate from CSR.
-
-        :param .le_util.CSR csr: DER-encoded Certificate Signing
-            Request.
-
-        :returns: `.CertificateResource` and certificate chain (as
-            returned by `.fetch_chain`).
-        :rtype: tuple
-
-        """
-        domains = crypto_util.get_sans_from_csr(
-                csr.data, OpenSSL.crypto.FILETYPE_ASN1)
-
-        authzr, domains = self.auth_handler.get_authorizations(domains,
-                                     self.config.allow_subset_of_names)
-
-        return self._obtain_certificate(
-            # TODO: add CN to domains?
-            domains, csr, authzr)
->>>>>>> Creating CSR after auth
-
     def obtain_certificate(self, domains):
         """Obtains a certificate from the ACME server.
 
@@ -274,11 +250,7 @@ class Client(object):
             self.config.rsa_key_size, self.config.key_dir)
         csr = crypto_util.init_save_csr(key, domains, self.config.csr_dir)
 
-<<<<<<< HEAD
-        return self.obtain_certificate_from_csr(domains, csr) + (key, csr)
-=======
-        return self._obtain_certificate(domains, csr, authzr) + (key, csr)
->>>>>>> Creating CSR after auth
+        return self.obtain_certificate_from_csr(domains, csr, authzr) + (key, csr)
 
     def obtain_and_enroll_certificate(self, domains):
         """Obtain and enroll certificate.