You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2020/08/18 02:56:23 UTC

[dubbo-go] branch develop updated: Fix: comment error

This is an automated email from the ASF dual-hosted git repository.

alexstocks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git


The following commit(s) were added to refs/heads/develop by this push:
     new 12b6d6a  Fix: comment error
12b6d6a is described below

commit 12b6d6aa5e70b0da2a667c4d822edc5593d2105d
Author: AlexStocks <al...@foxmail.com>
AuthorDate: Tue Aug 18 10:56:21 2020 +0800

    Fix: comment error
---
 protocol/dubbo/client.go | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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