manually resolve conflict in favor of node12 for v1

This commit is contained in:
Henning Makholm
2022-04-27 22:08:55 +02:00
parent e3983ef751
commit 8371fda073
-5
View File
@@ -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