Correction du conflit

cbdb95b7 · LAVANDIER Benjamin · e87812b1 · ec8dcf07 · cbdb95b7
Commit cbdb95b7 authored 4 years ago by LAVANDIER Benjamin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

recipe_soup.txt recipe_soup.txt +2 -1

No files found.
--- a/recipe_soup.txt
+++ b/recipe_soup.txt
@@ -29,6 +29,7 @@ cups.
 Recipe:  "International Cooking with Coca-Cola", a give-away pamphlet from
         The Coca-Cola Company, 1981 

+
 Bonjour mon ami imaginaire !

-Je veux écrire quelque chose
\ No newline at end of file
+Conflit c'est dommage !