[openssl/openssl] 293813: ci.yml: Fix bad conflict fix in backported patch

Tomáš Mráz noreply at github.com
Tue Dec 19 11:29:34 UTC 2023


  Branch: refs/heads/openssl-3.0
  Home:   https://github.com/openssl/openssl
  Commit: 293813d116ab7a6aa7cadc8daec13e8cb65fb702
      https://github.com/openssl/openssl/commit/293813d116ab7a6aa7cadc8daec13e8cb65fb702
  Author: Tomas Mraz <tomas at openssl.org>
  Date:   2023-12-19 (Tue, 19 Dec 2023)

  Changed paths:
    M .github/workflows/ci.yml

  Log Message:
  -----------
  ci.yml: Fix bad conflict fix in backported patch

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

(cherry picked from commit b80cee9658ff18a6dbb575015589ebde1a94ffdc)




More information about the openssl-commits mailing list