From 2b10cb5c0e21bce283f4c73477d97f6bd8b4a7ec Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Thu, 20 Apr 2017 18:47:53 -0400
Subject: [PATCH] Fixed merge nonsense
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3149)
---
test/ct_test.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/test/ct_test.c b/test/ct_test.c
index 67c8457032..6b36a43469 100644
--- a/test/ct_test.c
+++ b/test/ct_test.c
@@ -265,8 +265,6 @@ static int execute_cert_test(CT_TEST_FIXTURE fixture)
int i;
X509_EXTENSION *sct_extension = NULL;
- cert = load_pem_cert(fixture.certs_dir, fixture.certificate_file);
-
if (!TEST_ptr(cert = load_pem_cert(fixture.certs_dir,
fixture.certificate_file)))
goto end;
--
2.25.1