manually resolve conflict in favor of node12 for v1

github · Apr 27, 2022 · 8371fda · 8371fda
1 parent e3983ef
commit 8371fda
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/autobuild/action.yml b/autobuild/action.yml
@@ -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