yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9649 from zmstone/1230-fix-merge-conflict-resolution 

ci: fix bad merge conflict resolution
This commit is contained in:
Zaiming (Stone) Shi 2022-12-30 19:39:17 +01:00 committed by GitHub
parent c092ac2ced 18b18ade45
commit eec9833828
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/run_fvt_tests.yaml vendored
View File

@ -75,13 +75,8 @@ jobs:
- dns - dns
steps: steps:
<<<<<<< HEAD
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: erlef/setup-beam@v1
=======
- uses: actions/checkout@v1
- uses: emqx/setup-beam@v1.16.1-emqx - uses: emqx/setup-beam@v1.16.1-emqx
>>>>>>> origin/release-v44
with: with:
otp-version: 24.3.4.6 otp-version: 24.3.4.6
- name: prepare - name: prepare