Skip to content

robert/20260524_delete_recipe #390

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.

Sign up for GitHub

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

Open
under-dogeey wants to merge 4 commits into
base: main
Choose a base branch
from
Open

robert/20260524_delete_recipe #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a0f3b7f
added tonkatsu recipe
under-dogeey May 24, 2026
74c86f5
changed recipe name
under-dogeey May 24, 2026
9254c39
deleted orange chicken recipe
under-dogeey May 24, 2026
cfabfe0
Merge branch 'main' into deleterecipebranch2
under-dogeey May 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 0 additions & 56 deletions dinner/orange_chicken.html
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions dinner/tonkatsu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,24 @@

<body>
<a href="../index.html">home</a>
<<<<<<< deleterecipebranch2
<h1>items</h1>
=======
<h1>Tonkatsu</h1>
Comment on lines +9 to 12
Copy link
Copy Markdown
Contributor

@evanugarte evanugarte May 27, 2026

Choose a reason for hiding this comment

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

can we go through the files changed tab, make sure its only removing a file + associated entry in index.html

<h2>items</h2>
>>>>>>> main
<ul>
<li>pork</li>
<li>salt and pepper</li>
<li>eggs</li>
<li>breadcrumbs</li>
<li>oil</li>
</ul>
<<<<<<< deleterecipebranch2
<h1>steps</h1>
=======
<h2>steps</h2>
>>>>>>> main
<ul>
<li>make the dipping sauce</li>
<li>prepare the pork</li>
Expand Down
1 change: 0 additions & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ <h2 class="dropdown-toggle">Real</h2>
<h2 class="dropdown-toggle">Dinner</h2>
<div class="dropdown-content">
<ul>
<li><a href="dinner/orange_chicken.html">Orange Chicken</a></li>
<li><a href="dinner/garlic_noodles.html">Garlic Noodles</a></li>
<li><a href="dinner/fried_rice.html">Fried Rice</a></li>
<li><a href="dinner/tonkatsu.html">Tonkatsu</a></li>
Expand Down