mukta_mahabaleshwar/05252026_delete_grimaceshake_recipe#399
Open
muktamaha wants to merge 2 commits into
Open
Conversation
muktamaha
changed the title
Contributor
|
to fix the merge conflict on this pr we need to update the branch for this pr, this guide should explain how to do it if the merge conflict persists, we can try this to fix this |
This was referenced May 26, 2026
Contributor
Author
|
@evanugarte fixed it, hopefully it works now! |
evanugarte
reviewed
May 27, 2026
| <li><a href="drink/breakfast_smoothie.html">Breakfast Smoothie</a></li> | ||
| <li><a href="drink/iced-matcha.html">Iced Matcha Drink</a></li> | ||
|
|
||
| <li><a href="drink/grimaceshake.html">Grimace Shake</a></li> |
Contributor
There was a problem hiding this comment.
we have to remove this line too
This was referenced May 27, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Deleted the grimace shake because a grilled cheese is just better and more comforting :)