"commit to test the merge"
authorJulien Rougeron <julien.rougeron@iri.centrepompidou.fr>
Wed, 05 Sep 2012 11:36:05 +0200
changeset 67 7491c5d95bac
parent 66 bde8fa650864
child 68 418cd752d4be
"commit to test the merge"
firstCommitJulien.txt
--- a/firstCommitJulien.txt	Wed Sep 05 11:04:23 2012 +0200
+++ b/firstCommitJulien.txt	Wed Sep 05 11:36:05 2012 +0200
@@ -1,1 +1,3 @@
-First test file commited !!
\ No newline at end of file
+First test file commited !!
+
+This line is a modif to test the merge
\ No newline at end of file