解决冲突

06d397d1 · 华国豪 · a0fbe901 · 8f65b9ed · 06d397d1 · 06d397d1
Commit 06d397d1 authored Nov 01, 2019 by 华国豪 🙄
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 6351 additions and 0 deletions

jp.js src/assets/common/lang/jp.js +1683 -0

zh-tw.js src/assets/common/lang/zh-tw.js +2228 -0

zh.js src/assets/common/lang/zh.js +2440 -0

No files found.
--- a/src/assets/common/lang/jp.js
+++ b/src/assets/common/lang/jp.js
--- a/src/assets/common/lang/zh-tw.js
+++ b/src/assets/common/lang/zh-tw.js
--- a/src/assets/common/lang/zh.js
+++ b/src/assets/common/lang/zh.js