From 50ed8bc40cffaacc1efd00989343fabe6ed3d23d Mon Sep 17 00:00:00 2001 From: Simona Gioe Date: Thu, 23 Mar 2023 12:09:56 +0100 Subject: [PATCH 1/2] Drama? closes #1 but not really --- conflict.txt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 conflict.txt diff --git a/conflict.txt b/conflict.txt new file mode 100644 index 0000000..691323c --- /dev/null +++ b/conflict.txt @@ -0,0 +1,4 @@ +trying again to break everything + +It will work + From e945d10508668e0ef33d9566a0e44104eb700622 Mon Sep 17 00:00:00 2001 From: Simona Gioe Date: Thu, 23 Mar 2023 12:27:39 +0100 Subject: [PATCH 2/2] drama goma --- cauliflower_tacos.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cauliflower_tacos.md b/cauliflower_tacos.md index b7b6ba1..16906e9 100644 --- a/cauliflower_tacos.md +++ b/cauliflower_tacos.md @@ -1,6 +1,6 @@ -# Cauliflower tacos +# Cauliflower tacos without goma This recipe is taken as an example from https://github.com/sinker/tacofancy/blob/master/full_tacos/cauliflower_tacos.md.