From 31e954e32286a8a0242ef80495948991b96e7d2a Mon Sep 17 00:00:00 2001
From: winixt <haizekuo@gmail.com>
Date: Sat, 1 Apr 2023 16:03:58 +0800
Subject: [PATCH] docs: update README

---
 README.md | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/README.md b/README.md
index fd08a023..6fe39339 100644
--- a/README.md
+++ b/README.md
@@ -105,18 +105,10 @@ npm run dev
 
 ## 反馈
 
-<<<<<<< HEAD
-| Github Issue | Fes.js 开源运营小助手 |
-| --- | --- |
-| [@fesjs/fes.js/issues](../../issues) | <img src="https://cos-1254145788.cos.ap-guangzhou.myqcloud.com/WechatIMG104.jpeg" height="250"/> |
-
-=======
-| Github Issue | Fes.js 开源运营小助手 |
+| Github Issue                         | Fes.js 开源运营小助手                                                                            |
 | ------------------------------------ | ------------------------------------------------------------------------------------------------ |
 | [@fesjs/fes.js/issues](../../issues) | <img src="https://cos-1254145788.cos.ap-guangzhou.myqcloud.com/WechatIMG104.jpeg" height="250"/> |
 
-> > > > > > > next
-
 ## 参与共建
 
 我们非常欢迎社区同学能提交 PR：