From 09536474bdc66ac38b13c6c3c780fed5e55c282b Mon Sep 17 00:00:00 2001 From: Maoqiang Zheng Date: Thu, 23 Aug 2018 11:21:17 +0800 Subject: [PATCH] delect conflict --- public/index.html | 45 ++++++++++++++++++--------------------------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/public/index.html b/public/index.html index 59d0dad..abb066f 100644 --- a/public/index.html +++ b/public/index.html @@ -1,29 +1,20 @@ -<<<<<<< HEAD - -======= ->>>>>>> dev-mq - - - - - -<<<<<<< HEAD - web-gantt - - -