Skip to content

Commit 8371fda

Browse files
committed
manually resolve conflict in favor of node12 for v1
1 parent e3983ef commit 8371fda

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

autobuild/action.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,5 @@ inputs:
1313
$GITHUB_WORKSPACE as its working directory.
1414
required: false
1515
runs:
16-
<<<<<<< HEAD
1716
using: 'node12'
1817
main: '../lib/autobuild-action.js'
19-
=======
20-
using: 'node16'
21-
main: '../lib/autobuild-action.js'
22-
>>>>>>> origin/releases/v2

0 commit comments

Comments
 (0)