# HG changeset patch # User ymh # Date 1464781914 -7200 # Node ID ff220bcb880c3c896e2fb0ab44927c0269e0d77f # Parent cf76f922218c0abfecaa772457761a68fb50d513 test de bundle diff -r cf76f922218c -r ff220bcb880c README --- a/README Wed Jun 01 13:57:00 2016 +0200 +++ b/README Wed Jun 01 13:51:54 2016 +0200 @@ -1,34 +1,4 @@ This is the first file commited to the repo -Add another line -blah blah -This is a line added by TC - -Voici de lourdes modifications pour compliquer le merge - - -Hello world by Santiago - -Test 2 - -Geia sou kosmos - -beep beep - -Hello World - -toto from gautier -In branch boris - merged - -Another test sdsad\ -aasdasd - -asdfsa - -Nouvelle ligne - - -Moi aussi j'écris à la fin - -TC écrit une ligne \ No newline at end of file +Il y a eu un peu de nettoyage