From 18b18ade4523dbe9793e8a5fec991134154de3d3 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Fri, 30 Dec 2022 14:01:05 +0100 Subject: [PATCH] ci: fix bad merge conflict resolution --- .github/workflows/run_fvt_tests.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/run_fvt_tests.yaml b/.github/workflows/run_fvt_tests.yaml index bddc3ac21..8f9825600 100644 --- a/.github/workflows/run_fvt_tests.yaml +++ b/.github/workflows/run_fvt_tests.yaml @@ -75,13 +75,8 @@ jobs: - dns steps: -<<<<<<< HEAD - uses: actions/checkout@v3 - - uses: erlef/setup-beam@v1 -======= - - uses: actions/checkout@v1 - uses: emqx/setup-beam@v1.16.1-emqx ->>>>>>> origin/release-v44 with: otp-version: 24.3.4.6 - name: prepare