fix confliction

9 years ago · 290ee32f2d
parent 2d777f0bf5
commit 290ee32f2d
1 changed files with 0 additions and 1 deletions
--- 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 "