Remove git merge info from no-kneadbread.md (#778)

It seems as though merge info was left behind, just cleaning it up.
pull/779/head
Alex Iannantuono 2 years ago committed by GitHub
parent 4ded6b9a3a
commit bd4e29a376
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -21,15 +21,8 @@ author: enthdegree
## Directions ## 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. 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. 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) ![Before baking](/pix/no-knead-bread-2.webp)
3. Preheat oven and pan to 450 F (230 C). 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. 4. Bake for 30 minutes covered (e.g. aluminum foil), then 20 minutes uncovered.

Loading…
Cancel
Save