Conflict not resolved after rebasing

[seven-mile]

cc: @lanza Thanks for rebasing! It really clears my local polyfill patches. But it seems here is a straggler ; )

clangir/.github/workflows/docs.yml

Lines 100 to 117 in 34c12ae

	workflow:
	- '.github/workflows/docs.yml'
	<<<<<<< HEAD
	||||||| parent of 49be891dc52b (Drop use of comprimised action)
	- name: Fetch LLVM sources (PR)
	if: ${{ github.event_name == 'pull_request' }}
	uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
	with:
	fetch-depth: 1
	=======
	- name: Fetch LLVM sources (PR)
	if: ${{ github.event_name == 'pull_request' }}
	uses: actions/checkout@v4.2.2
	with:
	fetch-depth: 1
	>>>>>>> 49be891dc52b (Drop use of comprimised action)
	- name: Setup Python env
	uses: actions/setup-python@v5