Open javascript-translate-bot opened 5 years ago
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
3 out of 15 committers have signed the CLA.
:white_check_mark: tadjik1
:white_check_mark: iliakan
:white_check_mark: Violet-Bora-Lee
:x: candh
:x: JohnMcGuinness
:x: dragonwocky
:x: mihansweatpants
:x: him2312
:x: alaabouayed
:x: lex111
:x: h-n-y
:x: marksq
:x: Antiai
:x: Lim
:x: david-cho-lerat-HL2
This PR was automatically generated. Merge changes from en.javascript.info at 19223ae7
The following files have conflicts and may need new translations:
Please fix the conflicts by pushing new commits to this pull request, either by editing the files directly on GitHub or by checking out this branch.
We recommend to close this PR and merge conflicting changes manually.
The steps are:
git add remote upstream https://github.com/javascript-tutorial/en.javascript.info
git checkout master
git pull upstream master
git checkout --ours <path>
git checkout --theirs <path>
git diff --word-diff master...upstream/master <path>
(please note: three dots in the command)git push origin master
Please ignore changes in Readme.md (git checkout --ours Readme.md && git commit -m ignore Readme.md).