From 50c076f78506287862cb0a3524eb4ba32656ce46 Mon Sep 17 00:00:00 2001 From: GRONDIN Clarel Date: Tue, 22 Oct 2024 09:27:57 +0400 Subject: [PATCH 1/2] 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 c208f489b7d4cd94d438b2a0f10a6283c2d0cf06 Mon Sep 17 00:00:00 2001 From: Dorian BOYER Date: Tue, 22 Oct 2024 09:41:37 +0400 Subject: [PATCH 2/2] 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