Commit 2b10cb5c authored by Alex Gaynor's avatar Alex Gaynor Committed by Rich Salz
Browse files

Fixed merge nonsense 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3149)
parent b1a3030e

test/ct_test.c

+0 −2
Original line number Diff line number Diff line
@@ -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;