diff --git a/Cheun.md.txt b/Cheun.md.txt index 7359e36..26031b8 100644 --- a/Cheun.md.txt +++ b/Cheun.md.txt @@ -1,5 +1,4 @@ -<<<<<<< HEAD jkerklg,eorfiopefr -======= + AHAHAHHAHA GOTAGAAAAAAA, alors les gentle mate >>>>>>> d6c65328bfa0b5937a6a1944aeafa12e384d5216 diff --git a/GRONDINClarel/Clarel.txt b/GRONDINClarel/Clarel.txt index e69de29..08e00ed 100644 --- a/GRONDINClarel/Clarel.txt +++ b/GRONDINClarel/Clarel.txt @@ -0,0 +1 @@ +Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. \ No newline at end of file diff --git a/lou.txt b/lou.txt index 1cd909e..8dfd053 100644 --- a/lou.txt +++ b/lou.txt @@ -1 +1,5 @@ + +Mettez un truc sur la première ligne. + bonjour +