-
Notifications
You must be signed in to change notification settings - Fork 846
Sync with upstream @ 273e47b7 #30
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
not a biggie
Changed the sign on line 32,33.
Remove word "to" after a modal verb
'lines' instead of 'line' in the "multi-line input" section
Fixed syntax error / typo
Minor grammar change
Update solution.md
Minor grammar fix
Fixed typo
BEFORE "3. When this happens, a special “object wrapper” IS CREATED that provides the extra functionality, and then is destroyed." AFTER "3. When this happens, a special “object wrapper” that provides the extra functionality IS CREATED, and then is destroyed."
Updated article.md (better sentence flow)
Corrected grammar
Fix name of JavaScript
Corrected grammar
|
Merge branch 'master' of https://github.com/javascript-tutorial/en.javascript.info manually |
This PR was automatically generated.
Merge changes from en.javascript.info at 273e47b
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).