-
Notifications
You must be signed in to change notification settings - Fork 0
Sync with upstream @ 4a8d8987 #8
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
Update article.md
Fixed backticks missing
Update example scripts
Fix typo
Update article.md
Update article.md
Update article.md
'property values' instead of 'field' in code comment
Update article.md
Change double quotes for backtick to fix rendering
|
This PR was automatically generated to merge changes from en.javascript.info at 4a8d898
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.