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

diff -r 4ea086d67cb1 -r 2ca1471633e7 edwin.txt
--- a/edwin.txt	Wed Oct 03 11:02:12 2012 +0200
+++ b/edwin.txt	Wed Oct 03 11:02:47 2012 +0200
@@ -1,5 +1,1 @@
-ajout de fichier test
-
-Ajout d'une ligne dans le fichier Edwin.
-
-Bonjour, Monde !
\ No newline at end of file
+ajout de fichier test
\ No newline at end of file
diff -r 4ea086d67cb1 -r 2ca1471633e7 testAnthony.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/testAnthony.html	Wed Oct 03 11:02:47 2012 +0200
@@ -0,0 +1,1 @@
+test
\ No newline at end of file