From ef4dce4a2d36a2b5efbffb4e38c954b470428d33 Mon Sep 17 00:00:00 2001
From: vany5921 <908744431@qq.com>
Date: Wed, 11 Mar 2020 15:53:15 +0800
Subject: [PATCH] update introduction

---
 docs/zh_CN/arduino/arduino_development.md | 5 -----
 docs/zh_CN/uiflow/introduction.md         | 4 ----
 2 files changed, 9 deletions(-)

diff --git a/docs/zh_CN/arduino/arduino_development.md b/docs/zh_CN/arduino/arduino_development.md
index 2acae7fa..766081e2 100644
--- a/docs/zh_CN/arduino/arduino_development.md
+++ b/docs/zh_CN/arduino/arduino_development.md
@@ -82,12 +82,7 @@
 
 <img src="assets/img/related_documents/Arduino_IDE/CP210X_MAC.png">
 
-<script>
 
-   anchor_search();
-   scrollFunc();
-
-</style>
 
 <script>
 
diff --git a/docs/zh_CN/uiflow/introduction.md b/docs/zh_CN/uiflow/introduction.md
index 5b54712c..f6b05cd4 100644
--- a/docs/zh_CN/uiflow/introduction.md
+++ b/docs/zh_CN/uiflow/introduction.md
@@ -143,11 +143,7 @@
 
 ><img src="/image/base/usbmode.jpg" width="50%" height="50%">
 
-<<<<<<< HEAD
-## UIFlow教程
-=======
 ## 相关教材
->>>>>>> 1acd152fb823b79225d0152120c32c54db0205d5
 
 * [M5StickC物联网入门教程](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/M5StickC_Guide.pdf)