Merge branch 'master' into dependabot/github_actions/actions/checkout-3

2022-03-06 09:48:13 +03:00
parent 1e43c401e6 c64f678946
commit 3555b3dcc0
1 changed files with 0 additions and 4 deletions
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -34,11 +34,7 @@ jobs:
      - name: checkout
        uses: actions/checkout@v3
      - name: lint
-<<<<<<< HEAD
        uses: golangci/golangci-lint-action@v3
-=======
-        uses: golangci/golangci-lint-action@v3.1.0
->>>>>>> 0923093071cb (update workflows)
        continue-on-error: true
        with:
          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.