fixing conflicts

2015-07-07 16:26:37 -07:00
parent 82c4be29a4 c59bf3f257
commit 8239aa55e1
20 changed files with 302 additions and 631 deletions
--- a/lemur/plugins/bases/issuer.py
+++ b/lemur/plugins/bases/issuer.py
@@ -19,6 +19,3 @@ class IssuerPlugin(Plugin):
    def create_authority(self):
        raise NotImplemented

-    def get_csr_config(self):
-        raise NotImplementedError
-
--- a/lemur/plugins/lemur_verisign/plugin.py
+++ b/lemur/plugins/lemur_verisign/plugin.py
@@ -151,6 +151,3 @@ class VerisignPlugin(IssuerPlugin):
        response = self.session.post(url, headers={'content-type': 'application/x-www-form-urlencoded'})
        return self.handle_response(response.content)['Response']['Order']

-    def get_authorities(self):
-        pass
-