Fixed merge conflicts.

This commit is contained in:
Nick Winter 2014-10-06 17:57:47 -07:00
commit e6339d68a1

View file

@ -105,7 +105,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
recover:
recover_account_title: "找回账户"
send_password: "发送重置链接"
# recovery_sent: "Recovery email sent."
recovery_sent: "找回账户邮件已发送."
items:
armor: "盔甲"