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

fix conflict

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