fix: resolve conflict

8bc7a809 · Thomas Bouillon · 532770c4 · 2ee32926 · 8bc7a809
Commit 8bc7a809 authored 3 years ago by Thomas Bouillon
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

recipe_soup.txt recipe_soup.txt +4 -1

No files found.
--- a/recipe_soup.txt
+++ b/recipe_soup.txt
@@ -27,8 +27,11 @@ cups.


 Recipe:  "International Cooking with Coca-Cola", a give-away pamphlet from
-         The Coca-Cola Company, 1981 

 lfkjdslfs
 fldskjfmlsd
 mlfdskjflmsd
+
+Je suis une miette et alors ?efssfsefseffsefsef
+
+toi aussi tu as mis des données secretes ?