Skip to content
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

Sync with reactjs.org @ 72775e97 #191

Merged
merged 4 commits into from
Nov 19, 2019
Merged

Sync with reactjs.org @ 72775e97 #191

merged 4 commits into from
Nov 19, 2019

Conversation

reactjs-translation-bot
Copy link
Contributor

@reactjs-translation-bot reactjs-translation-bot commented Nov 18, 2019

This PR was automatically generated.

Merge changes from reactjs.org at 72775e9

The following files have conflicts and may need new translations:

Please fix the conflicts by pushing new commits to this pull request, either by editing the files directly on GitHub or by checking out this branch.

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.

@netlify
Copy link

netlify bot commented Nov 18, 2019

Deploy preview for ko-reactjs-org ready!

Built with commit 138f775

https://deploy-preview-191--ko-reactjs-org.netlify.com

=======
const urlRoot = 'https://reactjs.org';
const version = '16.12.0';
>>>>>>> 72775e97f9a5f26d93153f58e650eb8c604d207f
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will fix this.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@taehwanno taehwanno merged commit 89469e3 into master Nov 19, 2019
@taehwanno taehwanno deleted the sync-72775e97 branch November 19, 2019 04:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants