fix conflicts not found by git diff

8 years ago · 5677ae0888
parent 3ca5750ba8
commit 5677ae0888
1 changed files with 3 additions and 3 deletions
--- 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,
+DEFINE_int32(connrefused_retries_second,
-               10,
+             10,
-               "retry connrefused_retries_second if ECONNREFUSED occurs");
+             "retry connrefused_retries_second if ECONNREFUSED occurs");
 namespace paddle {