From 17e2b3a19a7d16cb6e6287951d19902d992dd62a Mon Sep 17 00:00:00 2001 From: Helin Wang Date: Wed, 31 May 2017 00:55:32 +0000 Subject: [PATCH] fix merge conflict --- go/pserver/client.go | 2 +- {paddle/go => go}/pserver/client_test.go | 2 +- {paddle/go => go}/pserver/internal/connection/conn.go | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename {paddle/go => go}/pserver/client_test.go (97%) rename {paddle/go => go}/pserver/internal/connection/conn.go (100%) diff --git a/go/pserver/client.go b/go/pserver/client.go index ad0d2bcb078..f8bd0aa59f3 100644 --- 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 b/go/pserver/client_test.go similarity index 97% rename from paddle/go/pserver/client_test.go rename to go/pserver/client_test.go index eab3f9a86bc..a9a0948a51a 100644 --- a/paddle/go/pserver/client_test.go +++ b/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/paddle/go/pserver/internal/connection/conn.go b/go/pserver/internal/connection/conn.go similarity index 100% rename from paddle/go/pserver/internal/connection/conn.go rename to go/pserver/internal/connection/conn.go -- GitLab