search

eosdac / eosdactoolkit

DEPRECATED The DAC toolkit for building and running DACs
MIT License
10 stars 13 forks source link

Updated Japanese translation #204

Closed ZahanWu closed 5 years ago

ZahanWu commented 5 years ago

Updated Japanese translation

lukestokes commented 5 years ago

Unfortunately this is causing conflicts as it looks like you're trying to merge master back into dev since https://github.com/ZahanWu/eosdactoolkit/tree/japanese-translation is not the dev branch, but a master branch. Could you try again using the dev branch? That way you'll just see the one file you want modified (the language file). Thanks! Ping me on Discord if you need some help.