From 5677ae08888bbef0f02f48a63c627e276844bbf7 Mon Sep 17 00:00:00 2001 From: wangyanfei01 Date: Thu, 22 Dec 2016 15:21:18 +0800 Subject: [PATCH] fix conflicts not found by git diff --- paddle/pserver/LightNetwork.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/paddle/pserver/LightNetwork.cpp b/paddle/pserver/LightNetwork.cpp index f20ed96cb6..9ddfa5bbb1 100644 --- a/paddle/pserver/LightNetwork.cpp +++ b/paddle/pserver/LightNetwork.cpp @@ -50,9 +50,9 @@ DEFINE_int32(sock_recv_buf_size, 1024 * 1024 * 40, "restrict sock recv buff size"); -P_DEFINE_int32(connrefused_retries_second, - 10, - "retry connrefused_retries_second if ECONNREFUSED occurs"); +DEFINE_int32(connrefused_retries_second, + 10, + "retry connrefused_retries_second if ECONNREFUSED occurs"); namespace paddle { -- GitLab