提交 290ee32f 编写于 作者: W wangyanfei01

fix confliction

上级 2d777f0b
...@@ -39,7 +39,6 @@ limitations under the License. */ ...@@ -39,7 +39,6 @@ limitations under the License. */
#include "TrainerConfigHelper.h" #include "TrainerConfigHelper.h"
P_DEFINE_string(config, "", "Trainer config file"); P_DEFINE_string(config, "", "Trainer config file");
<<<<<<< HEAD
P_DEFINE_int32(test_period, 0, P_DEFINE_int32(test_period, 0,
"if equal 0, do test on all test data at the end of " "if equal 0, do test on all test data at the end of "
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册