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

Issue 725 #998

Merged
merged 14 commits into from Oct 30, 2020
Merged

Issue 725 #998

merged 14 commits into from Oct 30, 2020

Conversation

strawberries73
Copy link
Contributor

@strawberries73 strawberries73 commented Oct 29, 2020

Added a drink and did some editing.

@luisbg
Copy link
Contributor

luisbg commented Oct 29, 2020

This sounds delicious. I should try it one day.

Small note. You might want to capitalize the first letter of each ingredient. I see other recipes doing that.

I am not a maintainer, so this is just my personal advice and unrelated to this PR being approved or not. I think it should be approved anyway and somebody (even yourself) can fix this later.

@strawberries73
Copy link
Contributor Author

I will do that, Thank you!

Note:  there is espresso and coffee in the directions.  The recipes I found online also usually have both.
@alfg
Copy link
Owner

alfg commented Oct 30, 2020

@strawberries73 Thanks for the addition and corrections! However, I can't merge until the conflict is fixed if you can check, please.

@strawberries73
Copy link
Contributor Author

Conflict Resolved. :) I had to look up how to do that.

@alfg alfg merged commit 97fab36 into alfg:master Oct 30, 2020
@alfg
Copy link
Owner

alfg commented Oct 30, 2020

Thanks for fixing!

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.

None yet

3 participants