fix conflict
Showing
... | @@ -9,6 +9,5 @@ require ( | ... | @@ -9,6 +9,5 @@ require ( |
github.com/gosuri/uilive v0.0.3 // indirect | github.com/gosuri/uilive v0.0.3 // indirect | ||
github.com/gosuri/uiprogress v0.0.1 | github.com/gosuri/uiprogress v0.0.1 | ||
github.com/spf13/cobra v0.0.5 | github.com/spf13/cobra v0.0.5 | ||
gopkg.in/AlecAivazis/survey.v1 v1.8.5 // indirect | |||
gopkg.in/yaml.v2 v2.2.2 | gopkg.in/yaml.v2 v2.2.2 | ||
) | ) |
github.com/AlecAivazis/survey v1.8.5/go.mod h1:iBNOmqKz/NUbZx3bA+4hAGLRC7fSK7tgtVDT4tB22XA= | |||
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= | github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= | ||
github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod h1:oX5x61PbNXchhh0oikYAH+4Pcfw5LKv21+Jnpr6r6Pc= | github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod h1:oX5x61PbNXchhh0oikYAH+4Pcfw5LKv21+Jnpr6r6Pc= | ||
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= | github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= | ||
... | ... |
想要评论请 注册 或 登录