Sync with reactjs.org @ 6dea652a #14
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
* Fixed broken link on readme.md file * Update README.md
tdd
reviewed
Feb 11, 2019
README.md
Outdated
| If you are interesting in translating `reactjs.org`, in another language please see the current translation efforts at [isreactreadyyet.com](https://www.isreactreadyyet.com). | ||
| ======= |
There was a problem hiding this comment.
@tesseralis is it me or did you just leave conflict markers in your commit? Sounds like you could use pre-commit check hooks 😉
There was a problem hiding this comment.
@tesseralis Also this should say "interested", not "interesting"
There was a problem hiding this comment.
@tdd the pre-commit markers are meant to be there! These are auto-generated by a bot and it's up to the language maintainers to fix the conflicts themselves (say, if a page that's already been translated has been updated).
Also gdi I did make a spelling error >_<
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.
Merge changes from reactjs.org at 6dea652
The following files have conflicts and may need new translations:
DO NOT SQUASH MERGE THIS PULL REQUEST!
Doing so will "erase" the commits from master and cause them to show up as conflicts the next time we merge.