fix: format error

netease-kit · May 17, 2018 · 16038b9 · 16038b9
1 parent b0ecb48
commit 16038b9
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/Documents/nim_changelog.md b/Documents/nim_changelog.md
@@ -24,8 +24,6 @@
 ### 变更
 * 组件的云信 SDK 依赖升级为 4.8.0
 
->>>>>>> ef55f5a69e2fe4872b8bc7eaf0f906ab51b7c9e5
-
 ## [2.4.0] - 2018-01-12
 ### 变更
 * 组件的云信 SDK 依赖升级为 4.7.0