chore: resolve merge conflicts in action.yml files

This commit is contained in:
Sam Robson
2026-11-04 17:02:02 +00:00
parent 205ef9f17d
commit 8f01efb334
5 changed files with 0 additions and 27 deletions

View File

@@ -51,10 +51,5 @@ outputs:
codeql-version:
description: The version of the CodeQL binary that was installed.
runs:
<<<<<<< HEAD
using: node20
main: '../lib/setup-codeql-entry.js'
=======
using: node24
main: "../lib/setup-codeql-entry.js"
>>>>>>> origin/releases/v4