mod: vendor

Signed-off-by: Jack Yu <jack.yu@suse.com>
rancher · May 8, 2024 · 83dcd62 · 83dcd62
1 parent 1dff339
commit 83dcd62
Show file tree

Hide file tree

Showing 3 changed files with 103 additions and 46 deletions.
diff --git a/vendor/github.com/prometheus/client_golang/api/client.go b/vendor/github.com/prometheus/client_golang/api/client.go
diff --git a/vendor/github.com/prometheus/client_golang/api/prometheus/v1/api.go b/vendor/github.com/prometheus/client_golang/api/prometheus/v1/api.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -360,15 +360,10 @@ github.com/pmezard/go-difflib/difflib
 ## explicit; go 1.16
 github.com/pquerna/cachecontrol
 github.com/pquerna/cachecontrol/cacheobject
-<<<<<<< HEAD
 # github.com/prometheus/client_golang v1.14.0
 ## explicit; go 1.17
-=======
-# github.com/prometheus/client_golang v1.12.1
-## explicit; go 1.13
 github.com/prometheus/client_golang/api
 github.com/prometheus/client_golang/api/prometheus/v1
->>>>>>> d245802e (feat: add prometheus alerts in support bundle)
 github.com/prometheus/client_golang/prometheus
 github.com/prometheus/client_golang/prometheus/collectors
 github.com/prometheus/client_golang/prometheus/internal