mirror of
https://github.com/github/codeql-action.git
synced 2026-05-21 21:08:32 +00:00
Resolve conflicts in action.yml files
This commit is contained in:
@@ -54,10 +54,5 @@ outputs:
|
||||
codeql-version:
|
||||
description: The version of the CodeQL binary that was installed.
|
||||
runs:
|
||||
<<<<<<< HEAD
|
||||
using: node20
|
||||
main: '../lib/setup-codeql-action.js'
|
||||
=======
|
||||
using: node24
|
||||
main: '../lib/setup-codeql-entry.js'
|
||||
>>>>>>> origin/releases/v4
|
||||
|
||||
Reference in New Issue
Block a user