mirror of
https://github.com/python/cpython.git
synced 2026-01-30 14:46:17 +00:00
This fixes an incorrect conflict resolution problem that happened in 0cdc3a575d14d710045084a615ef7f2536423727 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.