Browse Source

fix: update changelog

node 6 years ago
parent
commit
6f0aa7be4f
1 changed files with 2 additions and 3 deletions
  1. 2
    3
      CHANGELOG.md

+ 2
- 3
CHANGELOG.md View File

@@ -1,13 +1,12 @@
1 1
 # CHANGELOG
2 2
 
3
-<<<<<<< HEAD
4 3
 ## 1.0.0
5 4
 
6 5
 - [x] 完成通用评论国际化
7
-=======
6
+
8 7
 ## 0.5.14
8
+
9 9
 - [x] 增加onDelete回调
10
->>>>>>> upstream/master
11 10
 
12 11
 ## 0.5.13
13 12
 - [x] emoji增加到每页30个