提交 e0a0b1cc 编写于 作者: LinuxSuRen's avatar LinuxSuRen

fix conflict

上级 34c4bd25
...@@ -13,10 +13,6 @@ type OutputOption struct { ...@@ -13,10 +13,6 @@ type OutputOption struct {
Format string Format string
} }
type BatchOption struct {
Batch bool
}
type FormatOutput interface { type FormatOutput interface {
Output(obj interface{}, format string) (data []byte, err error) Output(obj interface{}, format string) (data []byte, err error)
} }
......
...@@ -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
) )
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册