From 9cca831eef8bad495189a2c91baebef0cf5f81ed Mon Sep 17 00:00:00 2001 From: Karl Hepworth Date: Thu, 30 Jul 2020 09:46:02 +1000 Subject: [PATCH] Revert "Bump github.com/imdario/mergo from 0.3.9 to 0.3.10 (#240)" (#242) This reverts commit c4ff1d32bfe83b17601e6ee5bb2ab9e1a2c878b7. --- go.mod | 3 ++- go.sum | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1ccafd72..99036935 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/ghodss/yaml v1.0.0 github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 // indirect github.com/gorilla/mux v1.7.4 // indirect - github.com/imdario/mergo v0.3.10 + github.com/imdario/mergo v0.3.9 github.com/mitchellh/go-homedir v1.1.0 github.com/mitchellh/mapstructure v1.3.0 // indirect github.com/moby/term v0.0.0-20200611042045-63b9a826fb74 // indirect @@ -32,4 +32,5 @@ require ( golang.org/x/net v0.0.0-20200513185701-a91f0712d120 // indirect golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9 // indirect gopkg.in/ini.v1 v1.56.0 // indirect + gopkg.in/yaml.v2 v2.3.0 // indirect ) diff --git a/go.sum b/go.sum index 97df191b..4b2dd0e0 100644 --- a/go.sum +++ b/go.sum @@ -126,8 +126,6 @@ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg= github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.10 h1:6q5mVkdH/vYmqngx7kZQTjJ5HRsx+ImorDIEQ+beJgc= -github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=