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

merge working prototype presented on sunday #12

Open
wants to merge 3 commits into
base: william_changes
Choose a base branch
from

Conversation

ayota
Copy link
Contributor

@ayota ayota commented Apr 3, 2016

No description provided.

@ndanielsen
Copy link
Contributor

conflicts =P

@ayota
Copy link
Contributor Author

ayota commented Apr 3, 2016

¯_(ツ)_/¯

we can go over it later ... can you use his logic to grab the
healthy/unhealthy designation? (still trying to go through the code and get
the PR merged to the branch I have on the main repo.)

On Sun, Apr 3, 2016 at 11:23 AM, Nathan [email protected] wrote:

conflicts =P


You are receiving this because you authored the thread.
Reply to this email directly or view it on GitHub
#12 (comment)

@ndanielsen
Copy link
Contributor

will do a little later today. I think that KrishnaKulkarni did something similar in his PR

@ayota
Copy link
Contributor Author

ayota commented Apr 3, 2016

Kris was just adding a form to adjust the nutrition guidelines at a later
date, and the Margot said she'd push her instructions for the nutrition
logic in a bit (or we can just go grab it on her repo).

On Sun, Apr 3, 2016 at 11:38 AM, Nathan [email protected] wrote:

will do a little later today. I think that KrishnaKulkarni did something
similar in his PR


You are receiving this because you authored the thread.
Reply to this email directly or view it on GitHub
#12 (comment)

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.

2 participants