Resolve conflicts in action.yml files

This commit is contained in:
Michael B. Gale
2026-05-15 13:21:17 +01:00
parent 4b79f1ba10
commit 70a1165f9a
7 changed files with 0 additions and 39 deletions
-6
View File
@@ -170,12 +170,6 @@ outputs:
codeql-version:
description: The version of the CodeQL binary used for analysis
runs:
<<<<<<< HEAD
using: node20
main: '../lib/init-action.js'
post: '../lib/init-action-post.js'
=======
using: node24
main: '../lib/init-entry.js'
post: '../lib/init-post-entry.js'
>>>>>>> origin/releases/v4