From e231e2d5aa2117472e1f4b8ba438614731236a19 Mon Sep 17 00:00:00 2001
From: caicai8 <1149225589@qq.com>
Date: Tue, 24 Dec 2019 17:28:54 +0800
Subject: [PATCH] fix

---
 Index.html | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Index.html b/Index.html
index 3d2a126..db1d497 100755
--- a/Index.html
+++ b/Index.html
@@ -76,19 +76,11 @@
             <a class="bottomItem" href="./machine.html">
                 <img src="./image/2.png" />AI智能服务
             </a>
-<<<<<<< HEAD
             <a class="bottomItem" href="javscript:void(0)"> 
                 <img src="./image/3.png" />战略目标库
             </a>
             <a class="bottomItem" href="./datail.html"> 
                 <img src="./image/4.png" />制式报告输出
-=======
-            <a class="bottomItem" href="javscript:void(0)">
-                <img src="./image/3.png" />案例精选
-            </a>
-            <a class="bottomItem" href="javscript:void(0)">
-                <img src="./image/4.png" />快速入门
->>>>>>> 636dc67cd946b3b122fb6d46222fed6de7a0f4bb
             </a>
         </div>
     </div>