diff --git a/Cheun.md.txt b/Cheun.md.txt index 47f59c9..a4ff0fb 100644 --- a/Cheun.md.txt +++ b/Cheun.md.txt @@ -1 +1 @@ -AHAHAHHAHA GOTAGAAAAAAA \ No newline at end of file +AHAHAHHAHA GOTAGAAAAAAA, alors les gentle mate \ No newline at end of file diff --git a/Gabriel.txt.txt b/Gabriel.txt.txt index 58b770f..a680d22 100644 --- a/Gabriel.txt.txt +++ b/Gabriel.txt.txt @@ -1 +1,5 @@ -cours github expernet \ No newline at end of file +<<<<<<< HEAD +LA KPOP C'EST NUL +======= +cours github expernet +>>>>>>> 8331ff78dd43c2c192752092ee9a1a70218f6a32 diff --git a/Jeremy.txt b/Jeremy.txt index 44df257..6ecfd6d 100644 --- a/Jeremy.txt +++ b/Jeremy.txt @@ -1 +1,3 @@ -poney unijambiste \ No newline at end of file +C'est une bonne situation ça scribe ? +======= +vous savez … je ne pense pas qu'il y ai de bonne ou mauvais situation… diff --git a/Thomy.txt b/Thomy.txt index 4208f7c..7689cac 100644 --- a/Thomy.txt +++ b/Thomy.txt @@ -1 +1,4 @@ -tes collab \ No newline at end of file + +tes collab +tomy j'ai pirater ton fichier texte + 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/dorian.txt.txt b/dorian.txt.txt index 7e8d2ee..02d23bd 100644 --- a/dorian.txt.txt +++ b/dorian.txt.txt @@ -1 +1 @@ -MONSTERRR LALALALALAA \ No newline at end of file +MONSTERRR LALALALALAA, gotata is meeee MONSTER j'ai pas la licence pour gotaga \ No newline at end of file diff --git a/toma.txt b/toma.txt index fa7174b..c9f390e 100644 --- a/toma.txt +++ b/toma.txt @@ -1 +1 @@ -Toma +Add Text Ludovic.