fix elsewhere

2023-01-20 20:32:48 +02:00
parent 408875b1be 2cfa4d515a
commit 26173d3a78
11 changed files with 152 additions and 46 deletions
--- a/merged/sections.yml
+++ b/merged/sections.yml
@ -186,7 +186,10 @@
    Tofu\r\n• Cheese\r\n• Flour & yeast\r\n• Peanut butter\r\n• season's fresh and
    frozen veggies "
  :image_id: 89
+<<<<<<< HEAD
  :card_template: card_full_image
+=======
+>>>>>>> 2cfa4d515a4f722214cc2981a17e9d4d759d6d17
 - :template: section_cards
  :index: 1
  :page_id: 9