Skip to content

Sync with reactjs.org @ 4244fc64 #83

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 4 commits into from
Apr 26, 2019
Merged

Sync with reactjs.org @ 4244fc64 #83

merged 4 commits into from
Apr 26, 2019

Conversation

reactjs-translation-bot
Copy link
Contributor

@reactjs-translation-bot reactjs-translation-bot commented Apr 26, 2019

This PR was automatically generated.

Merge changes from reactjs.org at 4244fc6

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 26, 2019

Deploy preview for pl-reactjs ready!

Built with commit 0215038

https://deploy-preview-83--pl-reactjs.netlify.com

@g12i g12i changed the base branch from master to hooks-reference April 26, 2019 18:48
@g12i g12i changed the base branch from hooks-reference to master April 26, 2019 18:48
@g12i
Copy link
Contributor

g12i commented Apr 26, 2019

It looks like the only difference between this and #80 is languages.yml added in 4244fc6. By the time #80 had been merged, this one came up and created the same conflicts again. Not sure what to do with it.

@jakubdrozdek
Copy link
Member

Maybe it was caused by an accidental squash merge? Bot message says that we shouldn't do it with 'sync' PRs.

@jakubdrozdek jakubdrozdek merged commit 41dc22b into master Apr 26, 2019
@jakubdrozdek jakubdrozdek deleted the sync-4244fc64 branch April 26, 2019 22:18
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