From 4acf42f1acd1286322a63695c65b7ba1268363aa Mon Sep 17 00:00:00 2001
From: Amour1688 <lcz_1996@foxmail.com>
Date: Mon, 14 Sep 2020 17:42:32 +0800
Subject: [PATCH] chore: 1.0.0-rc.3 changelog [ci skip]

---
 CHANGELOG.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa2030e..79c62ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.0.0-rc.3
+
+- 🐞 fix mergeProps order error ([bf59811](https://github.com/vuejs/jsx-next/commit/bf59811f4334dbc30fd62ba33a33926031dd8835))
+- 🌟 optional mergeProps ([e16695d](https://github.com/vuejs/jsx-next/commit/e16695d87e269000055828f32492690c4cf796b2))
+
 ## 1.0.0-rc.2
 
 `2020-08-28`
@@ -22,7 +27,7 @@
 
 `2020-07-22`
 
-- 🐞Properly force update on forwarded slots [#33](https://github.com/vueComponent/jsx/pull/33)
+- 🐞 Properly force update on forwarded slots [#33](https://github.com/vueComponent/jsx/pull/33)
 
 ## 1.0.0-beta.3