fix conflict

This commit is contained in:
sqrtthree 2017-01-02 22:07:26 +08:00
commit 99aa102fb1
6 changed files with 8527 additions and 470 deletions

2019
README-es.md Normal file

File diff suppressed because it is too large Load Diff

2009
README-he.md Normal file

File diff suppressed because it is too large Load Diff

1677
README-hn.md Normal file

File diff suppressed because it is too large Load Diff

1081
README.md

File diff suppressed because it is too large Load Diff

2018
translations/README-uk.md Normal file

File diff suppressed because it is too large Load Diff

11
translations/how-to.md Normal file
View File

@ -0,0 +1,11 @@
Please put new translation README files here.
I'll migrate the existing translations when they are ready.
To start a new translation, please:
1. Make an issue (for collaboration with other translators)
2. Make a pull request to collaborate and commit to.
3. Let me know when it's ready to pull.
Thank you!