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

master missing team update fixes from 299 #333

Open
lynxlynxlynx opened this issue Jul 20, 2018 · 0 comments
Open

master missing team update fixes from 299 #333

lynxlynxlynx opened this issue Jul 20, 2018 · 0 comments

Comments

@lynxlynxlynx
Copy link
Collaborator

#299 got merged into the then preview branch: https://github.com/letsdoitworld/World-Cleanup-Day/commits/react-native-app-prototype

It's missing from the final code that was pushed to the main react branch and subsequently master. This is causing merge conflicts to show also for #318. What happened? It doesn't appear this fresh code is obsolete.

(the same was true for the mobile README update, but I already cherry-picked that over)

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

No branches or pull requests

1 participant