From 8371fda073a032cce9008a4948a19b844eddff81 Mon Sep 17 00:00:00 2001 From: Henning Makholm Date: Wed, 27 Apr 2022 22:08:55 +0200 Subject: [PATCH] manually resolve conflict in favor of node12 for v1 --- autobuild/action.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/autobuild/action.yml b/autobuild/action.yml index 72b76e5c3..f28c8eb46 100644 --- 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