Skip to content
This repository has been archived by the owner on Jan 5, 2019. It is now read-only.

fix for #331 #334

Merged
merged 1 commit into from
Aug 24, 2017
Merged

fix for #331 #334

merged 1 commit into from
Aug 24, 2017

Conversation

goruck
Copy link
Contributor

@goruck goruck commented Aug 22, 2017

See #331 for details.

@rbaynes
Copy link
Contributor

rbaynes commented Aug 22, 2017

@goruck I made a few changes to your code and made a new PR #335
so I am closing this one and waiting for @spaghet to review 335.

@rbaynes rbaynes closed this Aug 22, 2017
@sp4ghet
Copy link
Collaborator

sp4ghet commented Aug 23, 2017

:| I feel like he deserves some recognition for the work he put in so I'd be more comfortable if you just added your changes on top of this PR @rbaynes, unless @goruck is fine with it.

Looked through both PRs and they look ok, just going to sit on this for a bit

@rbaynes
Copy link
Contributor

rbaynes commented Aug 23, 2017

Good point @spaghet. Sorry @goruck I didn't want to steal the great work you have done, I only wanted to make a few changes to your work.

@spaghet please just accept one of the PRs and I'll go from there. I need this merged in so I can complete the release process.

@rbaynes rbaynes reopened this Aug 23, 2017
@goruck
Copy link
Contributor Author

goruck commented Aug 23, 2017

@rbaynes no worries! Thanks for the opportunity to contribute! BTW, I live in Silicon Valley so sadly I can't take you up on the dev offer. But that won't stop me from working on this great project :)

Copy link
Collaborator

@sp4ghet sp4ghet left a comment

Choose a reason for hiding this comment

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

lgtm

@rbaynes rbaynes merged commit f918e5d into OpenAgricultureFoundation:develop Aug 24, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants