Sync with reactjs.org @ 6dea652a #107
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
|
So this is the first bot-made PR that has a conflict... I'll push a fixed commit |
smikitky
approved these changes
Feb 11, 2019
|
Perhaps we can add another textlint rule that checks whether there is a conflict marker ( |
koba04
approved these changes
Feb 12, 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.
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.