diff options
| author | Shpuld Shpuldson <shpuld@shpposter.club> | 2020-01-13 23:47:32 +0200 |
|---|---|---|
| committer | Shpuld Shpuldson <shpuld@shpposter.club> | 2020-01-13 23:47:32 +0200 |
| commit | b32888194c2b9de286bcfff9998dae009cea224d (patch) | |
| tree | eb907b6457bc6416c9a8661039848aebf8f1727a /src/i18n/messages.js | |
| parent | 33abbed5a1e1d1cf99d21d481b2a22481d7533b2 (diff) | |
| parent | 7257189ea796d51117285814d32ed6138fdb3458 (diff) | |
fix merge conflicts
Diffstat (limited to 'src/i18n/messages.js')
| -rw-r--r-- | src/i18n/messages.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 89c8a8c8..c56ae205 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -23,8 +23,8 @@ const messages = { he: require('./he.json'), hu: require('./hu.json'), it: require('./it.json'), - ja: require('./ja.json'), - ja_pedantic: require('./ja_pedantic.json'), + ja: require('./ja_pedantic.json'), + ja_easy: require('./ja_easy.json'), ko: require('./ko.json'), nb: require('./nb.json'), nl: require('./nl.json'), |