Skip to content

Conversation

reactjs-translation-bot
Copy link
Contributor

This PR was automatically generated.

Merge changes from reactjs.org at 6bc6e7b

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 Apr 24, 2019

Deploy preview for hi-reactjs failed.

Built with commit 3103464

https://app.netlify.com/sites/hi-reactjs/deploys/5cc07af0a04aee00070d4eef

Copy link
Member

@arshadkazmi42 arshadkazmi42 left a comment

Choose a reason for hiding this comment

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

💯

@arshadkazmi42 arshadkazmi42 merged commit fdc3c16 into master Apr 25, 2019
@arshadkazmi42 arshadkazmi42 deleted the sync-6bc6e7b1 branch April 25, 2019 03:11
saranshkataria added a commit that referenced this pull request Apr 25, 2019
resolved merge conflicts that were introduced by #32
saranshkataria added a commit that referenced this pull request Apr 25, 2019
resolved merge conflicts that were introduced by #32
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.