fix merge conflict

go-park-mail-ru · May 28, 2024 · a2b584b · a2b584b
1 parent 95ad0f0
commit a2b584b
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -24,11 +24,7 @@ jobs:
       - name: Run make test
         run: make test
 
-<<<<<<< HEAD
   linter:
-=======
-  golangci:
->>>>>>> 9693994540549bd2d8efa26ec4a7a7348eae8845
     name: Lint
     runs-on: ubuntu-latest
     steps: