cleanup

woodpecker-ci · Jan 13, 2024 · df93873 · df93873
1 parent c7af6c9
commit df93873
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -163,18 +163,15 @@ linters:
     - gocritic
     - nolintlint
     - stylecheck
-<<<<<<< HEAD:.golangci.yaml
     - contextcheck
     - forcetypeassert
-=======
     - gomnd
 
 issues:
   exclude-rules:
     - path: 'cmd/agent/flags.go|cmd/server/flags.go|pipeline/backend/kubernetes/flags.go|_test.go'
       linters:
         - gomnd
->>>>>>> 5705bca74 (Enable golangci linter gomnd):.golangci.yml
 
 run:
   timeout: 15m