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

rename the fishhook.h/c in FBRetainCycleDetector to rcd_fishhook.h/c #57

Merged
merged 5 commits into from Mar 6, 2018

Conversation

BrooksWon
Copy link

React Native which introduced a fishhook in facebook/react-native. This causes a conflict because the project also depends on FBMemoryProfiler which in turn has a dependncy on FBRetainCycleDetector where another fishhhook exists.

rename the fishhook.h/c in FBRetainCycleDetector to rcd_fishhook.h/c should solve the issue.

@facebook-github-bot
Copy link
Contributor

Thank you for your pull request and welcome to our community. We require contributors to sign our Contributor License Agreement, and we don't seem to have you on file. In order for us to review and merge your code, please sign up at https://code.facebook.com/cla. If you are contributing on behalf of someone else (eg your employer), the individual CLA may not be sufficient and your employer may need the corporate CLA signed.

If you have received this in error or have any questions, please contact us at cla@fb.com. Thanks!

@facebook-github-bot
Copy link
Contributor

Thank you for signing our Contributor License Agreement. We can now accept your code for this (and any) Facebook open source project. Thanks!

@megCanicalKb
Copy link
Contributor

Sorry about the delay, this looks good!
I fixed a merge conflict coming from a recently merged pulled-request touching the podspec file.

I'll let the integration tests finish and merge this, thanks for your contribution.

@megCanicalKb megCanicalKb merged commit e0da24c into facebook:master Mar 6, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants