From 614ef9bfdbd67e958e5ca930732ab0a465c96fd4 Mon Sep 17 00:00:00 2001
From: uy_sun <hmy0119@gmail.com>
Date: Sun, 8 Dec 2024 16:32:18 +0800
Subject: [PATCH] =?UTF-8?q?docs:=20=E8=A1=A5=E4=B8=8A=E4=B8=8A=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E7=89=88=E6=9C=AC=E5=BF=98=E8=AE=B0=E7=9A=84=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=97=A5=E5=BF=97=20[skip=20ci]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec9565a7..d668fcea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/lang/zh-CN/
 
 ## [4.1.4] - 2024-12-08
 
+### Fixed
+
+- 修复解决冲突时未能正确分类的问题
+
 ## [4.1.3] - 2024-12-05
 
 ### Changed