From 90c3767b7735a30daa2f62b4f9e6a6234cd13cf9 Mon Sep 17 00:00:00 2001 From: AHOVEY Saint-George Date: Tue, 22 Oct 2024 09:23:19 +0400 Subject: [PATCH 01/10] osecouuuuuur --- sgg.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sgg.txt b/sgg.txt index add0009..8ceace7 100644 --- a/sgg.txt +++ b/sgg.txt @@ -1,2 +1,3 @@ SG le best -aled \ No newline at end of file +aled +osecouuuur \ No newline at end of file From 4eae98bb4384af7fe3bf72abb03fdb38755661d7 Mon Sep 17 00:00:00 2001 From: AHOVEY Saint-George Date: Tue, 22 Oct 2024 09:25:08 +0400 Subject: [PATCH 02/10] osecouuuuur --- sgg.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/sgg.txt b/sgg.txt index 8ceace7..5903a86 100644 --- a/sgg.txt +++ b/sgg.txt @@ -1,3 +1 @@ -SG le best -aled osecouuuur \ No newline at end of file From bca391148d817dea9b8da46ab85b36793b5934bd Mon Sep 17 00:00:00 2001 From: 3thernitydev <3thernitydev@gmail.com> Date: Tue, 22 Oct 2024 09:26:48 +0400 Subject: [PATCH 03/10] add a line in despacito.txt --- despacito.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/despacito.txt b/despacito.txt index 45ee785..70e1505 100644 --- a/despacito.txt +++ b/despacito.txt @@ -1,4 +1,6 @@ -[Letra de "Despacito" ft. Daddy Yankee] +Salut Salut ! + +[Letra de "Despacito" ft. Daddy Yankee] [Intro: Luis Fonsi & Daddy Yankee] Ay, ¡Fonsi! ¡DY! @@ -99,4 +101,4 @@ Pasito a pasito, suave suavecito Nos vamos pegando, poquito a poquito Hasta provocar tus gritos (Fonsi) Y que olvides tu apellido (DY) -Despacito \ No newline at end of file +Despacito From 50c076f78506287862cb0a3524eb4ba32656ce46 Mon Sep 17 00:00:00 2001 From: GRONDIN Clarel Date: Tue, 22 Oct 2024 09:27:57 +0400 Subject: [PATCH 04/10] 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 05/10] 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 31d3040e3a5c69610e4caa81ca61e80a64d277be Mon Sep 17 00:00:00 2001 From: Rassaby Ludovic Date: Tue, 22 Oct 2024 09:34:17 +0400 Subject: [PATCH 06/10] Add text toma.txt --- ...txt Ludovic.txt README.md sgg.txt Theo.txt | 107 ++++++++++++++++++ toma.txt | 2 +- 2 files changed, 108 insertions(+), 1 deletion(-) create mode 100644 cestLeMatin.txt despacito.txt GRONDINClarel index.php Jeremy.txt Ludovic.txt README.md sgg.txt Theo.txt diff --git a/cestLeMatin.txt despacito.txt GRONDINClarel index.php Jeremy.txt Ludovic.txt README.md sgg.txt Theo.txt b/cestLeMatin.txt despacito.txt GRONDINClarel index.php Jeremy.txt Ludovic.txt README.md sgg.txt Theo.txt new file mode 100644 index 0000000..0bd63c6 --- /dev/null +++ b/cestLeMatin.txt despacito.txt GRONDINClarel index.php Jeremy.txt Ludovic.txt README.md sgg.txt Theo.txt @@ -0,0 +1,107 @@ +commit 08800bc133b9cf9dc13304843c364ebbf8a9e0f1 (HEAD -> main) +Merge: e17e6e4 7a81d3a +Author: Rassaby Ludovic +Date: Tue Oct 22 09:10:29 2024 +0400 + + Merge branch 'main' of https://github.com/Farad77/Bidule + +commit 7a81d3ad4e086006f30d1ddf1fd6324e8e7100a2 (origin/main, origin/HEAD) +Merge: 1d38b22 3585ff6 +Author: Jeremy Hoarau +Date: Tue Oct 22 09:18:18 2024 +0400 + + Merge branch 'main' of https://github.com/Farad77/Bidule + +commit 1d38b22d105f6a8061f7d2c4aa9d01867b152df1 +Author: Jeremy Hoarau +Date: Tue Oct 22 09:18:06 2024 +0400 + + ajout Jeremy.txt + +commit 3585ff6594b59da8f1a2a7dc2fd7857762ca8d3b +Merge: b0e680b 4488492 +Author: Théo CELEMANI +Date: Tue Oct 22 09:10:13 2024 +0400 + + Merge branch 'main' of https://github.com/Farad77/Bidule + +commit e17e6e4b50201c26b3194333de42f31fc17742fc +Merge: 148526e 4488492 +Author: Rassaby Ludovic +Date: Tue Oct 22 09:08:57 2024 +0400 + + Merge branch 'main' of https://github.com/Farad77/Bidule + +commit b0e680b8e271333568c2f9208bc2322ae405c9e0 +Merge: 70cb5a2 5bbbb96 +Author: Théo CELEMANI +Date: Tue Oct 22 09:08:21 2024 +0400 + + Merge branch 'main' of https://github.com/Farad77/Bidule + +commit 448849261618b5886edb7f3e1a0e21cfcc3d1ea2 +Author: AHOVEY Saint-George +Date: Tue Oct 22 09:07:43 2024 +0400 + + sggggg + +commit 20fe01b014c1f8affd616b7934e5a053863510b9 +Author: AH-YONG Emjy +Date: Tue Oct 22 09:06:42 2024 +0400 + + mj + +commit 5bbbb9638c8dd8ada087f759e1a6bb2f5f84d62d +Merge: cc87f6b 0f6310e +Author: GRONDIN Clarel +Date: Tue Oct 22 09:04:47 2024 +0400 + + Merge branch 'main' of https://github.com/Farad77/Bidule + +commit 70cb5a22d4bc593b0325c4f9c16aecfb75ff213d +Author: Théo CELEMANI +Date: Tue Oct 22 08:53:04 2024 +0400 + + Ajout fichier + +commit 0f6310e919372ba0ddc55806a60d5c4ec7427ba2 +Author: Mat911 +Date: Tue Oct 22 08:51:08 2024 +0400 + + add despacito textfile + +commit 148526e2957e1b969c4d6d2a2d9cd31d01b5634e +Author: Rassaby Ludovic +Date: Tue Oct 22 08:51:07 2024 +0400 + + add Ludovic.txt + +commit cc87f6be0f9cec9cb53284d47809984278b112c7 +Author: GRONDIN Clarel +Date: Tue Oct 22 08:50:41 2024 +0400 + + Clarel ajout + +commit 6fed42738ebf207bf9bf925644fa5a50e1643a36 +Author: gaad pasou +Date: Tue Oct 22 08:46:32 2024 +0400 + + nettoyage + +commit 3fdb5b1d71b77dfcabc44b05edd45ff1e4c5cda1 +Author: gaad pasou +Date: Tue Oct 22 08:44:58 2024 +0400 + + ajout copyrigt + +commit a4284054934fa680bb19fbe6ce9e77740ce44790 +Author: gaad pasou +Date: Mon Oct 21 16:18:51 2024 +0400 + + ajout fichiers index + +commit d783c24aa63d75b636735ae8dfda0d13278b3b4f +Author: gaad pasou +Date: Mon Oct 21 16:13:36 2024 +0400 + + first commit diff --git a/toma.txt b/toma.txt index a8a5b10..c9f390e 100644 --- a/toma.txt +++ b/toma.txt @@ -1 +1 @@ -AZylos +Add Text Ludovic. From 18540f73f839eed8bd7c852b686552cbdfe7f61d Mon Sep 17 00:00:00 2001 From: Krolaf Date: Tue, 22 Oct 2024 07:34:53 +0200 Subject: [PATCH 07/10] jerem_modiff --- Jeremy.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jeremy.txt b/Jeremy.txt index ad4e38e..6ecfd6d 100644 --- a/Jeremy.txt +++ b/Jeremy.txt @@ -1,3 +1,3 @@ C'est une bonne situation ça scribe ? ======= -poney unijambiste +vous savez … je ne pense pas qu'il y ai de bonne ou mauvais situation… From 52c6ca7e21d367842ae6f8c427829b9e3170d6f5 Mon Sep 17 00:00:00 2001 From: Toma Date: Tue, 22 Oct 2024 09:36:49 +0400 Subject: [PATCH 08/10] 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 09/10] 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 10/10] 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