提交 5677ae08 编写于 作者: W wangyanfei01

fix conflicts not found by git diff

上级 3ca5750b
...@@ -50,9 +50,9 @@ DEFINE_int32(sock_recv_buf_size, ...@@ -50,9 +50,9 @@ DEFINE_int32(sock_recv_buf_size,
1024 * 1024 * 40, 1024 * 1024 * 40,
"restrict sock recv buff size"); "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 { namespace paddle {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册