diff options
author | Alex Iannantuono <39533178+armeehn@users.noreply.github.com> | 2022-06-05 19:10:31 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-06 02:10:31 +0000 |
commit | bd4e29a37619f447a5e3f36defc4c9ab000fae5d (patch) | |
tree | 4959ae9db1d6aa7074e841db7ebf537fd61c1800 | |
parent | 4ded6b9a3a2186110bc7a5e67cec15a0603e4b1d (diff) |
Remove git merge info from no-kneadbread.md (#778)
It seems as though merge info was left behind, just cleaning it up.
-rw-r--r-- | content/no-knead-bread.md | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/content/no-knead-bread.md b/content/no-knead-bread.md index c12bb03..4d4b506 100644 --- a/content/no-knead-bread.md +++ b/content/no-knead-bread.md @@ -21,15 +21,8 @@ author: enthdegree ## Directions -<<<<<<< HEAD:content/no-knead-bread.md 1. Mix the dry ingredients then add the hot water. It should come out as a firm dough. 2. Leave the dough at room temperature for 12 hours. You can then keep the dough in the fridge for up to 48 hours before cooking. ![Before baking](/pix/no-knead-bread-2.webp) 3. Preheat oven and pan to 450 F (230 C). -======= - 1. Mix the dry ingredients then add the warm water. It should come out as a firm dough. - 2. Leave the dough at room temperature for 12 hours, or until doubled. - ![Before baking](pix/no-knead-bread-2.webp) - 3. Preheat oven and pan to 450 F. ->>>>>>> 92466dff0f3388c100a8dfb7c10f0c8cce705292:src/no-knead-bread.md 4. Bake for 30 minutes covered (e.g. aluminum foil), then 20 minutes uncovered. |