fix: solve conflicts

Author: anotherso1a

CHANGELOG.md

@@ -4,8 +4,15 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [3.0.9](https://github.com/ant-design/ant-design-mini/compare/3.0.8...3.0.9)
+
+- Feat/x-components [`#1391`](https://github.com/ant-design/ant-design-mini/pull/1391)
+- copilot系列组件 [`#1390`](https://github.com/ant-design/ant-design-mini/pull/1390)
+
 #### [3.0.8](https://github.com/ant-design/ant-design-mini/compare/3.0.7...3.0.8)
 
+> 21 January 2025
+
 - indexbar scroll  not silky [`#1386`](https://github.com/ant-design/ant-design-mini/pull/1386)
 
 #### [3.0.7](https://github.com/ant-design/ant-design-mini/compare/3.0.6...3.0.7)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-mini",
-  "version": "3.0.8",
+  "version": "3.0.9",
   "description": "antd-mini 是支付宝小程序 UI 组件库，遵循 Ant Design 规范。",
   "miniprogram": "compiled/wechat/src",
   "scripts": {
@@ -158,4 +158,4 @@
   ],
   "license": "MIT",
   "homepage": "https://github.com/ant-design/ant-design-mini"
-}
+}