summaryrefslogtreecommitdiffstats
path: root/INFO
diff options
context:
space:
mode:
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