-
Notifications
You must be signed in to change notification settings - Fork 30
Sync with upstream @ 70ca842b #33
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
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Grammar fixes
Grammar
Grammar
Grammar
Grammar
Grammar
Grammar
Grammar
Grammar
Grammar
Grammar
Grammar
Update article.md
Update task.md
Update article.md
Update article.md
Update article.md
Update task.md
Update task.md
Update task.md
Update article.md
Update task.md
Sp., small change(s). Looks like someone else fixed main problem w/ "There should be..." sentence before I got here :-)
Take 2 on 'There should be "loading" indications...." line.
Update article.md
Grammar suggestions
Update article.md
Grammar suggestions
Update article.md
Update article.md
Update task.md
Update article.md
Grammar suggestions
fix typo
Wouldn't this solution be more flexible?
Update article.md
Update solution.md
Update article.md
|
jakubdrozdek
approved these changes
Oct 30, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR was automatically generated to merge changes from en.javascript.info at 70ca842
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
This PR will be closed and replaced with a new one in a few days.