# HG changeset patch
# User veltr
# Date 1349254967 -7200
# Node ID 2ca1471633e77ee0b2a535a37cda71536cb66575
# Parent  4ea086d67cb12ebac3adf143e5ae26df97fda4c5# Parent  298c803245421a14a07ca39b19debab5c97340fb
Merge with 298c803245421a14a07ca39b19debab5c97340fb

diff -r 298c80324542 -r 2ca1471633e7 README
--- a/README	Wed Oct 03 11:00:45 2012 +0200
+++ b/README	Wed Oct 03 11:02:47 2012 +0200
@@ -1,9 +1,4 @@
-This is the first file commited to the repo
-Add another line
-and another
-stil one line
-blah blah
-This is a line added by TC
+Voici de lourdes modifications pour compliquer le merge
 
 Hello world  by  Santiago
 
@@ -13,6 +8,8 @@
 
 beep beep
 
+Hello World
+
 toto from gautier
 In branch boris - merged
 
@@ -22,3 +19,5 @@
 asdfsa
 
 Nouvelle ligne
+
+Moi aussi j'écris à la fin
\ No newline at end of file