diff --git a/protocol/dubbo/client.go b/protocol/dubbo/client.go index f020ec93404008112258c94d63c74361db480f49..cd25e0a07a02310ae32d3614b57343f15bd9bdc6 100644 --- a/protocol/dubbo/client.go +++ b/protocol/dubbo/client.go @@ -193,7 +193,11 @@ type Response struct { atta map[string]string } +<<<<<<< HEAD // NewResponse create a new Response. +======= +// nolint +>>>>>>> aaa8be31fea3c0fe7ebbc1247cb273e74eaeb83b func NewResponse(reply interface{}, atta map[string]string) *Response { return &Response{ reply: reply,