mirror of
https://github.com/github/codeql-action.git
synced 2026-05-22 13:59:03 +00:00
Resolve conflicts in action.yml files
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user