Fix merge

elastic · Jan 28, 2025 · 2593d37 · 2593d37
1 parent c7b17ca
commit 2593d37
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/.go-version b/.go-version
@@ -1,5 +1 @@
-<<<<<<< HEAD
-1.23.1
-=======
 1.23.5
->>>>>>> baed459 ([Automation] Bump Golang version to 1.23.5 (#4353))
diff --git a/.golangci.yml b/.golangci.yml
@@ -3,11 +3,7 @@ run:
   # timeout for analysis, e.g. 30s, 5m, default is 1m
   timeout: 1m
   build-tags: integration
-<<<<<<< HEAD
-  go: "1.23.1"
-=======
   go: "1.23.5"
->>>>>>> baed459 ([Automation] Bump Golang version to 1.23.5 (#4353))
 
 issues:
   # Maximum count of issues with the same text.