fix confliction

290ee32f · wangyanfei01 · 2d777f0b · 290ee32f
隐藏空白更改
内联并排

Showing with 0 addition and 1 deletion

paddle/trainer/Trainer.cpp paddle/trainer/Trainer.cpp +0 -1

未找到文件。
--- a/paddle/trainer/Trainer.cpp
+++ b/paddle/trainer/Trainer.cpp
@@ -39,7 +39,6 @@ limitations under the License. */
 #include "TrainerConfigHelper.h"

 P_DEFINE_string(config, "", "Trainer config file");
-<<<<<<< HEAD

 P_DEFINE_int32(test_period, 0,
               "if equal 0, do test on all test data at the end of "