Closed javascript-translate-bot closed 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.
1 out of 7 committers have signed the CLA.
:white_check_mark: iliakan
:x: dhx-mike-palandra
:x: raminrez
:x: lex111
:x: segayuu
:x: tonchique
:x: root
This PR was automatically generated to merge changes from en.javascript.info at a0266c57
Conflicted files in this PR have labels ">>>..." with both sides of conflict. If you merge this PR, you'll need to examine the listed files and resolve conflicts.
Alternatively, you can close this PR and merge conflicting changes manually.
The following files have conflicts and may need updates of the translations:
To merge changes manually (instead of merging this PR):
git add remote upstream https://github.com/javascript-tutorial/en.javascript.info
git checkout master
git pull upstream master
git checkout --ours <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).
This PR will be closed and replaced with a new one in a few days.