# HG changeset patch
# User Anthony Ly <anthonyly.com@gmail.com>
# Date 1349255352 -7200
# Node ID 0b1e09cbe1603d4732e020730f6e7453c0cbf37b
# Parent  8e21c2349c8004e08507f69ac551262333cd6aa2# Parent  2ca1471633e77ee0b2a535a37cda71536cb66575
resolve readme

diff -r 8e21c2349c80 -r 0b1e09cbe160 README
--- a/README	Wed Oct 03 11:02:54 2012 +0200
+++ b/README	Wed Oct 03 11:09:12 2012 +0200
@@ -1,9 +1,13 @@
+
 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
@@ -12,6 +16,8 @@
 
 beep beep
 
+Hello World
+
 toto from gautier
 In branch boris - merged
 
@@ -23,4 +29,4 @@
 Nouvelle ligne
 
 
-test sur readme by Antho
\ No newline at end of file
+Moi aussi j'écris à la fin