Fix merge conflicts on master

This commit is contained in:
Kim Gardner
2018-01-04 16:43:51 -05:00
parent e2534e7ca8
commit bf1fbfe03f
21 changed files with 554 additions and 4 deletions
@@ -10,3 +10,7 @@ zh_CN:
talk-plugin-love:
love: "爱"
loved: "已爱"
en:
talk-plugin-love:
love: 喜歡
loved: 已喜歡