mirror of
https://github.com/github/codeql-action.git
synced 2026-11-09 22:44:49 +00:00
chore: resolve merge conflicts in action.yml files
This commit is contained in:
@@ -21,10 +21,5 @@ outputs:
|
||||
environment:
|
||||
description: The inferred build environment configuration.
|
||||
runs:
|
||||
<<<<<<< HEAD
|
||||
using: node20
|
||||
main: '../lib/resolve-environment-entry.js'
|
||||
=======
|
||||
using: node24
|
||||
main: "../lib/resolve-environment-entry.js"
|
||||
>>>>>>> origin/releases/v4
|
||||
|
||||
Reference in New Issue
Block a user