From 50c076f78506287862cb0a3524eb4ba32656ce46 Mon Sep 17 00:00:00 2001 From: GRONDIN Clarel Date: Tue, 22 Oct 2024 09:27:57 +0400 Subject: [PATCH 1/5] push ligne 1 lou.txt --- GRONDINClarel/Clarel.txt | 1 + lou.txt | 1 + 2 files changed, 2 insertions(+) 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 e69de29..afa0cb1 100644 --- a/lou.txt +++ b/lou.txt @@ -0,0 +1 @@ +Mettez un truc sur la première ligne. \ No newline at end of file From 16c867f2a2fb1ac8fc7603141a7699c1c6ddba4c Mon Sep 17 00:00:00 2001 From: Dorian BOYER Date: Tue, 22 Oct 2024 09:33:23 +0400 Subject: [PATCH 2/5] dodo --- Cheun.md.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cheun.md.txt b/Cheun.md.txt index 47f59c9..f9d0b14 100644 --- a/Cheun.md.txt +++ b/Cheun.md.txt @@ -1 +1 @@ -AHAHAHHAHA GOTAGAAAAAAA \ No newline at end of file +jkerklg,eorfiopefr \ No newline at end of file From 52c6ca7e21d367842ae6f8c427829b9e3170d6f5 Mon Sep 17 00:00:00 2001 From: Toma Date: Tue, 22 Oct 2024 09:36:49 +0400 Subject: [PATCH 3/5] up --- toma.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toma.txt b/toma.txt index c9f390e..c80aa75 100644 --- a/toma.txt +++ b/toma.txt @@ -1 +1 @@ -Add Text Ludovic. +Add Tefto Ludovic. From 6d6942a4dcf9b6e00d0d41961b954e5d13bfcb47 Mon Sep 17 00:00:00 2001 From: Krolaf Date: Tue, 22 Oct 2024 07:40:56 +0200 Subject: [PATCH 4/5] jerem_modif --- Jeremy.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Jeremy.txt b/Jeremy.txt index 6ecfd6d..ce77d7b 100644 --- a/Jeremy.txt +++ b/Jeremy.txt @@ -1,3 +1,2 @@ C'est une bonne situation ça scribe ? -======= vous savez … je ne pense pas qu'il y ai de bonne ou mauvais situation… From c208f489b7d4cd94d438b2a0f10a6283c2d0cf06 Mon Sep 17 00:00:00 2001 From: Dorian BOYER Date: Tue, 22 Oct 2024 09:41:37 +0400 Subject: [PATCH 5/5] test --- Cheun.md.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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