aboutsummaryrefslogtreecommitdiffstats
path: root/INFO
diff options
context:
space:
mode:
authorkubi <jean.gaoliang@huawei.com>2016-10-24 08:03:42 +0000
committerkubi <jean.gaoliang@huawei.com>2016-10-24 08:04:56 +0000
commit4202e19192fb201d6ad58f95025602590524a165 (patch)
treeaedd3e331dd95918490eab309a91a830397e059c /INFO
parent57661d4fe2a37a7beb9d93651a82bf2d7a3cd5b0 (diff)
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>
Diffstat (limited to 'INFO')
-rw-r--r--INFO3
1 files changed, 1 insertions, 2 deletions
diff --git a/INFO b/INFO
index 6498ff805..8c46fe191 100644
--- 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