fix conflicts not found by git diff

5677ae08 · wangyanfei01 · 3ca5750b · 5677ae08
隐藏空白更改
内联并排

Showing with 3 addition and 3 deletion

paddle/pserver/LightNetwork.cpp paddle/pserver/LightNetwork.cpp +3 -3

未找到文件。
--- 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 {