From 290ee32f2d36e4ce328113fcf862ef7bf4c558af Mon Sep 17 00:00:00 2001
From: wangyanfei01 <wangyanfei01@baidu.com>
Date: Mon, 5 Dec 2016 14:38:35 +0800
Subject: [PATCH] fix confliction

---
 paddle/trainer/Trainer.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/paddle/trainer/Trainer.cpp b/paddle/trainer/Trainer.cpp
index 6ba5d99f5a..2ffc3e18d9 100644
--- 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 "
-- 
GitLab