firstCommitJulien.txt
changeset 68 418cd752d4be
parent 67 7491c5d95bac
--- a/firstCommitJulien.txt	Wed Sep 05 11:36:05 2012 +0200
+++ b/firstCommitJulien.txt	Wed Sep 05 11:47:05 2012 +0200
@@ -1,3 +1,3 @@
 First test file commited !!
 
-This line is a modif to test the merge
\ No newline at end of file
+This line is a modif to test the merge --> modif
\ No newline at end of file