ci.yml: Fix bad conflict fix in backported patch
authorTomas Mraz <tomas@openssl.org>
Tue, 19 Dec 2023 11:11:51 +0000 (12:11 +0100)
committerTomas Mraz <tomas@openssl.org>
Tue, 19 Dec 2023 11:27:18 +0000 (12:27 +0100)
commitb80cee9658ff18a6dbb575015589ebde1a94ffdc
tree6108ea1168a26c6ab23399f88b748ac25168b2e2
parent2b44ec759677a44e8c467440848a8622990ac69c
ci.yml: Fix bad conflict fix in backported patch

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23090)
.github/workflows/ci.yml