fix merge conflict

8 years ago · 17e2b3a19a
parent 319c91cc14
commit 17e2b3a19a
3 changed files with 2 additions and 2 deletions
--- 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