-
Notifications
You must be signed in to change notification settings - Fork 25
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
Added GALETTE recipe #15
Conversation
Hello, looks like you have a conflict in To fix that: git checkout Hesaneh-recipe
git fetch upstream
git rebase upstream/main Fix the conflicts in git add index.html
git rebase --continue If everything is clean ( git push --force Let me know! |
6f3abb7
to
16919c4
Compare
Hello, |
index.html
Outdated
@@ -54,7 +54,7 @@ | |||
<div class="column"> | |||
</div> | |||
<div class="column"> | |||
<div id="Hazelnut_cookie"><script>include("recipes/Hazelnut_cookie.md", "Hazelnut_cookie")</script></div> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This doesn't look right... You removed another recipe to add yours!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I fixed it. I separated Hazelnut_cookie and Galette into different columns.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Now it looks like you removed "tarte_tatin" 🙃 . I'm going to fix that for you 😉
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes I did🙃 but I added it back.
Thank you for fixing it, and for the class.
044ee24
to
aeb96cd
Compare
Everything fixed! |
Hello,
This is my Galette recipe.