From 4e1c9ad36a883a992ce0e1a8603576739784b444 Mon Sep 17 00:00:00 2001
From: yuqing521 <1581446178@qq.com>
Date: Tue, 31 Aug 2021 18:33:59 +0800
Subject: [PATCH] fix: readme

---
 README.CN.md | 4 ----
 README.md    | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/README.CN.md b/README.CN.md
index eb0c836a5..fb50e8515 100644
--- a/README.CN.md
+++ b/README.CN.md
@@ -623,10 +623,6 @@ class MyApp extends WeElement {
 | `beforeRender`   |  `render()` 之前                         |
 | `receiveProps`   | 父组件更新时候触发, 返回 false 可以阻止更新      |
 
-<<<<<<< HEAD
-
-=======
->>>>>>> 0604c68311e9e2a566617123b30f055211daa112
 ### 查看所有注册的元素
 
 ```js
diff --git a/README.md b/README.md
index 6ce985ef1..80e6e3661 100644
--- a/README.md
+++ b/README.md
@@ -478,10 +478,6 @@ export default class oButton extends WeElement<ButtonProps> {
 | `beforeRender`   | before `render()`                           |
 | `receiveProps`   | parent element re-render will trigger it, `return false` will prevent update action|
 
-<<<<<<< HEAD
-=======
-
->>>>>>> 0604c68311e9e2a566617123b30f055211daa112
 ### View registered elements
 
 ```js