diff --git a/conflict.txt b/conflict.txt index 8a49814..5a11fee 100644 --- a/conflict.txt +++ b/conflict.txt @@ -1 +1,2 @@ +banane proute \ No newline at end of file