From 97dbb7609c80eb6195f18f28ddf8c7f9134a9c4b Mon Sep 17 00:00:00 2001
From: Helin Wang <ustc.harry@gmail.com>
Date: Sun, 21 May 2017 19:30:52 -0400
Subject: [PATCH] resolve compile caused by merging branches

---
 paddle/go/pserver/client.go | 29 -----------------------------
 1 file changed, 29 deletions(-)

diff --git a/paddle/go/pserver/client.go b/paddle/go/pserver/client.go
index 5b110af648..1c98aea6d1 100644
--- a/paddle/go/pserver/client.go
+++ b/paddle/go/pserver/client.go
@@ -1,34 +1,5 @@
 package pserver
 
-// ElementType is the type of elements of a Parameter.
-type ElementType int
-
-// Supported element types
-const (
-	Int32 ElementType = iota
-	UInt32
-	Int64
-	UInt64
-	Float32
-	Float64
-)
-
-// Parameter is a piece of data to sync with the parameter server.
-type Parameter struct {
-	Name        string
-	ElementType ElementType
-	Content     []byte
-}
-
-// ParameterWithConfig contains the parameter and the configuration.
-type ParameterWithConfig struct {
-	Param  Parameter
-	Config []byte // parameter configuration in Proto Buffer format
-}
-
-// Gradient is the gradient of the parameter.
-type Gradient Parameter
-
 // Client is the client to parameter servers.
 type Client struct {
 }
-- 
GitLab