mirror of
https://github.com/python/cpython.git
synced 2026-05-10 06:31:43 -04:00
07acf5756f
This fixes an incorrect conflict resolution problem that happened
in 0cdc3a575d while backporting
PR #97533 as PR #107115 (merged prematurely). This problem caused
GitHub Actions CI/CD to crash while attempting to load the workflow
file definition, preventing the jobs that are defined in
`.github/workflows/build.yml` from actually starting.