ci: Remove typos

cheqd · Jun 3, 2024 · 383178c · 383178c
1 parent 8f3a8f6
commit 383178c
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -27,11 +27,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-<<<<<<< HEAD
-      - uses: actions/setup-go@v4
-=======
       - uses: actions/setup-go@v5
->>>>>>> de4cfddd071cda233430244cf8be66765e102114
         with:
           go-version-file: ./go.mod
           cache: false # temporarily off, as golangci-lint doesn't align 100% with cached setup-go@v4, see: https://github.com/golangci/golangci-lint-action/issues/807