mirror of
https://github.com/github/codeql-action.git
synced 2026-05-22 05:18:35 +00:00
Resolve conflicts in action.yml files
This commit is contained in:
@@ -15,10 +15,5 @@ inputs:
|
||||
$GITHUB_WORKSPACE as its working directory.
|
||||
required: false
|
||||
runs:
|
||||
<<<<<<< HEAD
|
||||
using: node20
|
||||
main: '../lib/autobuild-action.js'
|
||||
=======
|
||||
using: node24
|
||||
main: '../lib/autobuild-entry.js'
|
||||
>>>>>>> origin/releases/v4
|
||||
|
||||
Reference in New Issue
Block a user