Update .golangci.yml

elastic · Dec 18, 2024 · a3fc29d · a3fc29d
1 parent 90960d0
commit a3fc29d
Showing 1 changed file with 0 additions and 16 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -131,27 +131,11 @@ linters-settings:
     require-specific: false
 
   staticcheck:
-<<<<<<< HEAD
-    # Select the Go version to target. The default is '1.13'.
-    go: "1.22.10"
     checks: ["all"]
 
   stylecheck:
-    # Select the Go version to target. The default is '1.13'.
-    go: "1.22.10"
     checks: ["all"]
 
-  unused:
-    # Select the Go version to target. The default is '1.13'.
-    go: "1.22.10"
-
-=======
-    checks: ["all"]
-
-  stylecheck:
-    checks: ["all"]
-
->>>>>>> 2bdc3c509a (feat: bump to go 1.23.0)
   gosec:
     excludes:
     - G306 # Expect WriteFile permissions to be 0600 or less