README
author Anthony Ly <anthonyly.com@gmail.com>
Wed, 03 Oct 2012 11:18:19 +0200
changeset 91 2c55439bb1e0
parent 87 0b1e09cbe160
child 92 4790ac17d170
permissions -rw-r--r--
ajout de css
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
87
0b1e09cbe160 resolve readme
Anthony Ly <anthonyly.com@gmail.com>
parents: 86 84
diff changeset
     1
0
91936d9fe036 First commit
ymh@a07311.centrepompidou.lan
parents:
diff changeset
     2
This is the first file commited to the repo
1
62e29841c811 add a new line
ymh@illuvatar
parents: 0
diff changeset
     3
Add another line
86
8e21c2349c80 change sur le readme
Anthony Ly <anthonyly.com@gmail.com>
parents: 80
diff changeset
     4
8
b5baf402f325 user foo
foo
parents: 7
diff changeset
     5
blah blah
16
b9ca2111a272 change line endings to unix
ymh <ymh.work@gmail.com>
parents: 13
diff changeset
     6
This is a line added by TC
b9ca2111a272 change line endings to unix
ymh <ymh.work@gmail.com>
parents: 13
diff changeset
     7
84
4ea086d67cb1 Test avant merge
veltr
parents: 80
diff changeset
     8
Voici de lourdes modifications pour compliquer le merge
16
b9ca2111a272 change line endings to unix
ymh <ymh.work@gmail.com>
parents: 13
diff changeset
     9
87
0b1e09cbe160 resolve readme
Anthony Ly <anthonyly.com@gmail.com>
parents: 86 84
diff changeset
    10
16
b9ca2111a272 change line endings to unix
ymh <ymh.work@gmail.com>
parents: 13
diff changeset
    11
Hello world  by  Santiago
b9ca2111a272 change line endings to unix
ymh <ymh.work@gmail.com>
parents: 13
diff changeset
    12
b9ca2111a272 change line endings to unix
ymh <ymh.work@gmail.com>
parents: 13
diff changeset
    13
Test 2
24
6d4e4ada7590 Removed unused stuff
Boris de Laage <bdelaage@universcine.com>
parents: 20
diff changeset
    14
6d4e4ada7590 Removed unused stuff
Boris de Laage <bdelaage@universcine.com>
parents: 20
diff changeset
    15
Geia sou kosmos
28
36d9290f1091 test from murky
ymh <ymh.work@gmail.com>
parents: 24
diff changeset
    16
36d9290f1091 test from murky
ymh <ymh.work@gmail.com>
parents: 24
diff changeset
    17
beep beep
29
b79f40f773fe This a test with the Gautier login
ymh <ymh.work@gmail.com>
parents: 28
diff changeset
    18
84
4ea086d67cb1 Test avant merge
veltr
parents: 80
diff changeset
    19
Hello World
4ea086d67cb1 Test avant merge
veltr
parents: 80
diff changeset
    20
29
b79f40f773fe This a test with the Gautier login
ymh <ymh.work@gmail.com>
parents: 28
diff changeset
    21
toto from gautier
50
18ec53c9192f Merge with 25559acf1f833d99bf7a232563bf8d3ef2e94328
ymh <ymh.work@gmail.com>
parents: 29 25
diff changeset
    22
In branch boris - merged
54
ymh <ymh.work@gmail.com>
parents: 53
diff changeset
    23
ymh <ymh.work@gmail.com>
parents: 53
diff changeset
    24
Another test  sdsad\
ymh <ymh.work@gmail.com>
parents: 53
diff changeset
    25
aasdasd
ymh <ymh.work@gmail.com>
parents: 53
diff changeset
    26
57
957da92c9fb6 new commit
Julia Anaya <julia.anaya@gmail.com>
parents: 56
diff changeset
    27
asdfsa
54
ymh <ymh.work@gmail.com>
parents: 53
diff changeset
    28
80
cb2b649a228e nouvelle ligne
Anthony Ly <anthonyly.com@gmail.com>
parents: 57
diff changeset
    29
Nouvelle ligne
84
4ea086d67cb1 Test avant merge
veltr
parents: 80
diff changeset
    30
86
8e21c2349c80 change sur le readme
Anthony Ly <anthonyly.com@gmail.com>
parents: 80
diff changeset
    31
87
0b1e09cbe160 resolve readme
Anthony Ly <anthonyly.com@gmail.com>
parents: 86 84
diff changeset
    32
Moi aussi j'écris à la fin