From 169bc109dedcc8b75071771bed539270d21e3ad7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 15:26:16 -0400 Subject: [PATCH] chore(deps): bump golang.org/x/vuln from 1.0.4 to 1.1.2 (#558) Bumps [golang.org/x/vuln](https://github.com/golang/vuln) from 1.0.4 to 1.1.2. - [Release notes](https://github.com/golang/vuln/releases) - [Commits](https://github.com/golang/vuln/compare/v1.0.4...v1.1.2) --- updated-dependencies: - dependency-name: golang.org/x/vuln dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 242fdf279d427f80405db5f4bf0960fb66d96845) # Conflicts: # go.mod --- go.mod | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/go.mod b/go.mod index 95c86eb6..756e37a7 100644 --- a/go.mod +++ b/go.mod @@ -26,8 +26,13 @@ require ( github.com/stretchr/testify v1.8.4 golang.org/x/tools v0.22.0 golang.org/x/vuln v1.1.2 +<<<<<<< HEAD google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f google.golang.org/grpc v1.60.1 +======= + google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 + google.golang.org/grpc v1.62.1 +>>>>>>> 242fdf2 (chore(deps): bump golang.org/x/vuln from 1.0.4 to 1.1.2 (#558)) google.golang.org/protobuf v1.32.0 mvdan.cc/gofumpt v0.6.0 )