-
Notifications
You must be signed in to change notification settings - Fork 47
Sync with upstream @ 08734734 #5
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
iteration -> iterators
fix typo in article title
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
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."
Update solution.md
typo
Del redundant 'then' word
Update article.md
Change number of flags
Fix css comments
Fixed typos
Fixed ArrayBuffer article link; Fixed typo;
Fix Websocket article typo
Update article.md
Update article.md
|
Updated Repo
This PR was automatically generated to merge changes from en.javascript.info at 0873473
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 new 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).