diff options
| author |  dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> | 2024-03-11 10:12:06 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2024-03-11 10:12:06 +0000 |
| commit | e24efcac8b67baa9454bf27631e5e49f898a88d4 (patch) | |
| tree | d9adec2f05e1d8714edee66062a4b95a81ee2a61 /vendor/google.golang.org/protobuf/proto/merge.go | |
| parent | [bugfix] Fix whitespace move_id issue (#2742) (diff) | |
| download | gotosocial-e24efcac8b67baa9454bf27631e5e49f898a88d4.tar.xz | |
[chore]: Bump github.com/gin-contrib/cors from 1.5.0 to 1.7.0 (#2745)
Diffstat (limited to 'vendor/google.golang.org/protobuf/proto/merge.go')
| -rw-r--r-- | vendor/google.golang.org/protobuf/proto/merge.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/google.golang.org/protobuf/proto/merge.go b/vendor/google.golang.org/protobuf/proto/merge.go index d761ab331..3c6fe5780 100644 --- a/vendor/google.golang.org/protobuf/proto/merge.go +++ b/vendor/google.golang.org/protobuf/proto/merge.go @@ -21,7 +21,7 @@ import ( // The unknown fields of src are appended to the unknown fields of dst. // // It is semantically equivalent to unmarshaling the encoded form of src -// into dst with the UnmarshalOptions.Merge option specified. +// into dst with the [UnmarshalOptions.Merge] option specified. func Merge(dst, src Message) { // TODO: Should nil src be treated as semantically equivalent to a // untyped, read-only, empty message? What about a nil dst? |