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
@@ -94,12 +94,6 @@ outputs:
sarif-id:
description: The ID of the uploaded SARIF file.
runs:
<<<<<<< HEAD
using: node20
main: "../lib/analyze-action.js"
post: "../lib/analyze-action-post.js"
=======
using: node24
main: "../lib/analyze-entry.js"
post: "../lib/analyze-post-entry.js"
>>>>>>> origin/releases/v4