fix merge conflict

17e2b3a1 · Helin Wang · 319c91cc · 17e2b3a1 · 17e2b3a1 · 17e2b3a1
Showing with 2 addition and 2 deletion

go/pserver/client.go go/pserver/client.go +1 -1

go/pserver/client_test.go go/pserver/client_test.go +1 -1

go/pserver/internal/connection/conn.go go/pserver/internal/connection/conn.go +0 -0

未找到文件。
--- a/go/pserver/client.go
+++ b/go/pserver/client.go
@@ -6,7 +6,7 @@ import (
 	"sort"
 	"time"

-	"github.com/PaddlePaddle/Paddle/paddle/go/pserver/internal/connection"
+	"github.com/PaddlePaddle/Paddle/go/pserver/internal/connection"
 )

 // TODO(helin): add RPC call retry logic

--- a/paddle/go/pserver/client_test.go
+++ b/paddle/go/pserver/client_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"

-	"github.com/PaddlePaddle/Paddle/paddle/go/pserver"
+	"github.com/PaddlePaddle/Paddle/go/pserver"
 )

 const numPserver = 10

--- a/paddle/go/pserver/internal/connection/conn.go
+++ b/paddle/go/pserver/internal/connection/conn.go