-
Notifications
You must be signed in to change notification settings - Fork 47
Sync with upstream @ 19223ae7 #3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
For consistency with the rest of the document and the "coding style" chapter
Added a space after "for"
there was a typo
Just a little typos
fixing getting "wateramount"
Fix name of JavaScript
Corrected grammar
#8: fix unordered list
Typo: F.property => F.prototype
Update article.md
Update article.md
Update article.md
|
Update repo 04-Sept-2018
This PR was automatically generated.
Merge changes from en.javascript.info at 19223ae
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).