mirror of
https://github.com/github/codeql-action.git
synced 2026-05-08 06:40:19 +00:00
manually resolve conflict in favor of node12 for v1
This commit is contained in:
@@ -13,10 +13,5 @@ inputs:
|
||||
$GITHUB_WORKSPACE as its working directory.
|
||||
required: false
|
||||
runs:
|
||||
<<<<<<< HEAD
|
||||
using: 'node12'
|
||||
main: '../lib/autobuild-action.js'
|
||||
=======
|
||||
using: 'node16'
|
||||
main: '../lib/autobuild-action.js'
|
||||
>>>>>>> origin/releases/v2
|
||||
|
||||
Reference in New Issue
Block a user