From 12b6d6aa5e70b0da2a667c4d822edc5593d2105d Mon Sep 17 00:00:00 2001
From: AlexStocks <alexstocks@foxmail.com>
Date: Tue, 18 Aug 2020 10:56:21 +0800
Subject: [PATCH] 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 cd25e0a07..ee7b6ed6f 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,
--
GitLab