-
Notifications
You must be signed in to change notification settings - Fork 82
Sync with upstream @ dccca58f #162
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
Currently, the error is alerted and the console is empty (at least in Chrome).
Remove possibly outdated comment
It seems there are no polymorphic functions in this chapter.
Fix possibly outdated note in 1.9.6 (instanceof)
Include "object" in MDN link
Update task.md
Minor clarification on WeakMap and WeakSet
Replace rules.indent array with number
Update topic sentence
Fix links in 1.8.4 (Prototype methods)
Add emphasis for clarity
Update article.md
Delete excess semicolon in 1.9.1 (Class basic syntax)
Clarify task code place in 1.9.1 (Class basic syntax)
Add missing semicolons in 1.9.2 (Class inheritance)
|
|
This PR was automatically generated to merge changes from en.javascript.info at dccca58
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.infogit checkout mastergit pull upstream mastergit checkout --ours <path>git diff --word-diff master...upstream/master <path>(please note: three dots in the command)git push origin masterThis PR will be closed and replaced with a new one in a few days.