fix merge mess

2023-01-20 20:41:16 +02:00 · 2023-01-20 20:41:16 +02:00 · 3951bf3b8e
parent 8f84685af3
commit 3951bf3b8e
1 changed files with 0 additions and 4 deletions
--- a/merged/sections.yml
+++ b/merged/sections.yml
@ -186,10 +186,6 @@
    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