firstCommitJulien.txt
author Anthony Ly <anthonyly.com@gmail.com>
Wed, 03 Oct 2012 11:14:40 +0200
changeset 90 4984acb3309b
parent 68 418cd752d4be
permissions -rw-r--r--
Merge bonjour bonsoir
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
67
7491c5d95bac "commit to test the merge"
Julien Rougeron <julien.rougeron@iri.centrepompidou.fr>
parents: 66
diff changeset
     1
First test file commited !!
7491c5d95bac "commit to test the merge"
Julien Rougeron <julien.rougeron@iri.centrepompidou.fr>
parents: 66
diff changeset
     2
68
418cd752d4be "lets test the merge"
Julien Rougeron <julien.rougeron@iri.centrepompidou.fr>
parents: 67
diff changeset
     3
This line is a modif to test the merge --> modif