bugfix: update info error when rebase

a line do not delete when rebase

JIRA: YARDSTICK-376

Change-Id: I451fb482247e4787b2157f3d3c6c5db8ec25b783
Signed-off-by: kubi <jean.gaoliang@huawei.com>

diff --git a/INFO b/INFO
index 6498ff8..8c46fe1 100644 (file)
--- a/INFO
+++ b/INFO
@@ -17,12 +17,11 @@ wenjing_chu@dell.com
 liangqi1@huawei.com
 jean.gaoliang@huawei.com
 vincenzo.m.riccobene@intel.com
-<<<<<<< HEAD
 lvjing5@huawei.com
 wu.zhihui1@zte.com.cn
 14_ykl@tongji.edu.cn
 limingjiang@huawei.com
 
 Link to TSC approval: http://meetbot.opnfv.org/meetings/
-Link to approval of additional submitters: 
+Link to approval of additional submitters:
 Link to approval of new PTL: Done via Condorcet Internet Voting Service, avaliable from Raymond Piak