fix merge mess
This commit is contained in:
parent
8f84685af3
commit
3951bf3b8e
@ -186,10 +186,6 @@
|
|||||||
Tofu\r\n• Cheese\r\n• Flour & yeast\r\n• Peanut butter\r\n• season's fresh and
|
Tofu\r\n• Cheese\r\n• Flour & yeast\r\n• Peanut butter\r\n• season's fresh and
|
||||||
frozen veggies "
|
frozen veggies "
|
||||||
:image_id: 89
|
:image_id: 89
|
||||||
<<<<<<< HEAD
|
|
||||||
:card_template: card_full_image
|
|
||||||
=======
|
|
||||||
>>>>>>> 2cfa4d515a4f722214cc2981a17e9d4d759d6d17
|
|
||||||
- :template: section_cards
|
- :template: section_cards
|
||||||
:index: 1
|
:index: 1
|
||||||
:page_id: 9
|
:page_id: 9
|
||||||
|
Loading…
Reference in New Issue
Block a user