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

Move and Rename propType definitions in ShadowPropTypesIOS #21379

Closed
wants to merge 4 commits into from

Conversation

gvarandas
Copy link
Contributor

related #21342

TODO

move TransformPropTypes.js
fix flow error

CheckList

  • yarn prettier
  • yarn flow-check-android
  • yarn flow-check-ios

Test Plan

All flow checks pass.

Release Notes

[GENERAL] [ENHANCEMENT] [DeprecatedShadowPropTypesIOS.js] - Created.

@facebook-github-bot facebook-github-bot added the CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. label Sep 28, 2018
@elicwhite
Copy link
Member

Looks like you have a merge conflict. ColorPropType was changed to DeprecatedColorPropType in another commit.

@gvarandas
Copy link
Contributor Author

gvarandas commented Sep 28, 2018

@TheSavior, just updated the PR. Sorry about that. 🤖

@facebook-github-bot facebook-github-bot added the Import Started This pull request has been imported. This does not imply the PR has been approved. label Sep 28, 2018
Copy link
Contributor

@facebook-github-bot facebook-github-bot left a comment

Choose a reason for hiding this comment

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

TheSavior is landing this pull request. If you are a Facebook employee, you can view this diff on Phabricator.

@elicwhite
Copy link
Member

No problem, not your fault. Just a race condition from landing the other one first. Thanks for updating and thanks for contributing!

@react-native-bot
Copy link
Collaborator

@gvarandas merged commit f94d2ad into facebook:master.


Once this commit is added to a release, you will see the corresponding version tag below the description at f94d2ad. If the commit has a single master tag, it is not yet part of a release.

@facebook facebook locked as resolved and limited conversation to collaborators Sep 28, 2018
@react-native-bot react-native-bot added the Merged This PR has been merged. label Sep 28, 2018
@hramos hramos removed Import Started This pull request has been imported. This does not imply the PR has been approved. labels Feb 6, 2019
t-nanava pushed a commit to microsoft/react-native-macos that referenced this pull request Jun 17, 2019
…21379)

Summary:
related facebook#21342

move TransformPropTypes.js
fix flow error

- [x] yarn prettier
- [x] yarn flow-check-android
- [x] yarn flow-check-ios

All flow checks pass.

[GENERAL] [ENHANCEMENT] [DeprecatedShadowPropTypesIOS.js] - Created.
Pull Request resolved: facebook#21379

Differential Revision: D10098750

Pulled By: TheSavior

fbshipit-source-id: f7f2e4bf7b837c00a14b1fbd930d1b29ffb63549
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. Merged This PR has been merged. Platform: iOS iOS applications.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants