[Merged by Bors] - chore(CI): fix merge conflict resolution for nightly-testing#40257

Garmelon wants to merge 1 commit into

leanprover-community:masterleanprover-community/mathlib4:masterfrom

Garmelon:fix-nightly-conflict-resolutionGarmelon/mathlib4:fix-nightly-conflict-resolutionCopy head branch name to clipboard