fix merge conflict

PaddlePaddle · May 31, 2017 · 17e2b3a · 17e2b3a
1 parent 319c91c
commit 17e2b3a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git 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

diff --git a/paddle/go/pserver/client_test.go → go/pserver/client_test.go b/paddle/go/pserver/client_test.go → 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

diff --git a/...le/go/pserver/internal/connection/conn.go → go/pserver/internal/connection/conn.go b/...le/go/pserver/internal/connection/conn.go → go/pserver/internal/connection/conn.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@