diff --git a/conflict b/conflict index 06da6cba5f4ba4bd4c4a3f257368fcb38df3c18e..20878d157c12e729e77772aab4d15b9e3585f2a2 100644 --- a/conflict +++ b/conflict @@ -1,3 +1,5 @@ to create +Des conflits, des conflits. a -conflict \ No newline at end of file +conflict +Des conflits ici aussi.