Skip to content

Commit 46c4076

Browse files
committed
fix merge
1 parent ee2bbc8 commit 46c4076

File tree

5 files changed

+97
-157
lines changed

5 files changed

+97
-157
lines changed

go.mod

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ require (
1313
github.com/hashicorp/go-retryablehttp v0.7.8
1414
github.com/hashicorp/vault/api v1.20.0
1515
github.com/imdario/mergo v0.3.15
16-
github.com/onsi/ginkgo/v2 v2.17.1
17-
github.com/onsi/gomega v1.32.0
1816
github.com/pkg/errors v0.9.1
1917
github.com/prometheus/client_golang v1.22.0
2018
github.com/r3labs/diff/v3 v3.0.1
@@ -62,15 +60,13 @@ require (
6260
github.com/go-openapi/jsonpointer v0.19.6 // indirect
6361
github.com/go-openapi/jsonreference v0.20.2 // indirect
6462
github.com/go-openapi/swag v0.22.3 // indirect
65-
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
6663
github.com/gogo/protobuf v1.3.2 // indirect
6764
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6865
github.com/golang/protobuf v1.5.4 // indirect
6966
github.com/golang/snappy v0.0.4 // indirect
7067
github.com/google/gnostic-models v0.6.8 // indirect
7168
github.com/google/go-querystring v1.1.0 // indirect
7269
github.com/google/gofuzz v1.2.0 // indirect
73-
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
7470
github.com/gorilla/websocket v1.5.0 // indirect
7571
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
7672
github.com/hashicorp/errwrap v1.1.0 // indirect

0 commit comments

Comments
 (0)