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

Added GALETTE recipe #15

Merged
merged 4 commits into from
Mar 17, 2025
Merged

Conversation

Hessaneh
Copy link
Contributor

Hello,
This is my Galette recipe.

@claudiodsf
Copy link
Contributor

Hello, looks like you have a conflict in index.html 😉

To fix that:

git checkout Hesaneh-recipe
git fetch upstream
git rebase upstream/main

Fix the conflicts in index.html, then:

git add index.html
git rebase --continue

If everything is clean (git status), you can force-push:

git push --force

Let me know!
Claudio

@Hessaneh
Copy link
Contributor Author

Hello,
I resolved the conflict.
Thank you!

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>
Copy link
Contributor

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!

Copy link
Contributor Author

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.

Copy link
Contributor

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 😉

Copy link
Contributor Author

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.

@claudiodsf claudiodsf merged commit 208ed9f into git-impatient:main Mar 17, 2025
@claudiodsf
Copy link
Contributor

Everything fixed!

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.

3 participants