From 786871a5b5e4dd9c9369f81de10bb8b0eb247e21 Mon Sep 17 00:00:00 2001
From: vany5921 <908744431@qq.com>
Date: Mon, 30 Mar 2020 17:53:20 +0800
Subject: [PATCH] update ac_socket

---
 docs/en/app/ac_socket.md     | 1 -
 docs/zh_CN/core/atom_lite.md | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/en/app/ac_socket.md b/docs/en/app/ac_socket.md
index e83127f0..cdb45f28 100644
--- a/docs/en/app/ac_socket.md
+++ b/docs/en/app/ac_socket.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # AC Socket
 
 <div class="badge badge-pill badge-primary product_sku_tag">SKU:K031</div>
diff --git a/docs/zh_CN/core/atom_lite.md b/docs/zh_CN/core/atom_lite.md
index 34dd8dd8..dbd5784d 100644
--- a/docs/zh_CN/core/atom_lite.md
+++ b/docs/zh_CN/core/atom_lite.md
@@ -60,7 +60,7 @@
     </div>
 </div>
 
-## 外设的管脚映射
+## 管脚映射
 
 <table>
  <tr><td>RGB Led</td><td>G27</td></tr>
@@ -83,9 +83,9 @@
 ## 相关链接
 
 - **数据手册**
-
     - [ESP32-PICO](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/esp32-pico-d4_datasheet_cn.pdf)
     - [WS2812B-2020](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/WS2812B-2020_ZH_cn_V1.3.pdf)
+
 <script>
 
    var purchase_link = 'https://m5stack.com/collections/m5-core/products/atom-lite-esp32-development-kit';