mergo: Upgrade to 0.3.12 to fix panic

Signed-off-by: Jayme Howard <g.prime@gmail.com>

Run `go mod tidy`

Signed-off-by: Jayme Howard <g.prime@gmail.com>

Follow correct procedure by running `make vendor`

Signed-off-by: Jayme Howard <g.prime@gmail.com>
This commit is contained in:
Jayme Howard
2021-07-29 10:25:36 -05:00
parent 5d3e8fd2c0
commit ce437864b2
7 changed files with 17 additions and 9 deletions

2
vendor/modules.txt vendored
View File

@@ -249,7 +249,7 @@ github.com/hashicorp/errwrap
# github.com/hashicorp/go-multierror v1.0.0
## explicit
github.com/hashicorp/go-multierror
# github.com/imdario/mergo v0.3.11
# github.com/imdario/mergo v0.3.12
## explicit
github.com/imdario/mergo
# github.com/json-iterator/go v1.1.10