fix(custom): 修复冲突

CHANGELOG.md

@@ -1,3 +1,24 @@
+# 2.0.0 (2023-05-26)
+
+
+### Bug Fixes
+
+* **custom:** 测试fixbug的changelog ([7426b75](https://github.com/mcmcCat/vue3-vite-template/commit/7426b75974252271c01035237b1eb821e43ce759))
+* **custom:** changelog的bug ([146591c](https://github.com/mcmcCat/vue3-vite-template/commit/146591cfb8a217d158ca3b0bfafbd4ee2ba5c737))
+* **custom:** changelog改为手动执行 ([ce95ca5](https://github.com/mcmcCat/vue3-vite-template/commit/ce95ca5aae2c4511e8dfe09b2c86330c0b715f5c))
+* **custom:** changelog改为手动执行 ([cc71a5a](https://github.com/mcmcCat/vue3-vite-template/commit/cc71a5a39f0670b41530617b4c2ab66d08459759))
+* **custom:** changelogbug解决 ([1460056](https://github.com/mcmcCat/vue3-vite-template/commit/146005600ea2e58e82914c241bc0891ddbd38da0))
+* **custom:** cz规则中关闭scope关键字 ([7323589](https://github.com/mcmcCat/vue3-vite-template/commit/73235894ff8238161cf13b5326839d8ad26251ea))
+
+
+### Features
+
+* add new feature ([eee6453](https://github.com/mcmcCat/vue3-vite-template/commit/eee645363a99ad98d2d5c8c138e144ae6486d34e))
+* **custom:** 新版本 ([0403d3a](https://github.com/mcmcCat/vue3-vite-template/commit/0403d3ad6c7f781d152f74d2286e46ef1284be73))
+* **custom:** 增加自定义组件和router和pinia及其持久化插件 ([26d7e33](https://github.com/mcmcCat/vue3-vite-template/commit/26d7e339d5ed050f47a16402704a7240f5edf361))
+
+
+
 # 1.0.0 (2023-05-13)