From bb262b05db890f452a46d6cfa84c44b24669fa66 Mon Sep 17 00:00:00 2001 From: Noel Thomy Date: Mon, 21 Oct 2024 18:25:00 +0400 Subject: [PATCH 1/6] recuperationThomy --- Thomy.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Thomy.txt b/Thomy.txt index 8e702b6..4208f7c 100644 --- a/Thomy.txt +++ b/Thomy.txt @@ -1 +1 @@ -Test push github \ No newline at end of file +tes collab \ No newline at end of file From 342ed9af78aec004f5e46b33a7458f969584e633 Mon Sep 17 00:00:00 2001 From: Noel Thomy Date: Mon, 21 Oct 2024 18:35:37 +0400 Subject: [PATCH 2/6] resolution3 --- Thomy.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Thomy.txt b/Thomy.txt index 7689cac..b508de4 100644 --- a/Thomy.txt +++ b/Thomy.txt @@ -1,4 +1,3 @@ - tes collab tomy j'ai pirater ton fichier texte From 934f4631c0050cb674445595c3b8fd9548d2fedb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20CELEMANI?= Date: Tue, 22 Oct 2024 09:26:21 +0400 Subject: [PATCH 3/6] Modife sgg --- sgg.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sgg.txt b/sgg.txt index add0009..62a738c 100644 --- a/sgg.txt +++ b/sgg.txt @@ -1,2 +1 @@ -SG le best -aled \ No newline at end of file +SG LE BEST \ No newline at end of file From b12e6fdcec2353af9f00913abe96872895846322 Mon Sep 17 00:00:00 2001 From: Rassaby Ludovic Date: Tue, 22 Oct 2024 09:36:32 +0400 Subject: [PATCH 4/6] Add text2 toma.txt --- toma.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toma.txt b/toma.txt index c9f390e..5daeed9 100644 --- a/toma.txt +++ b/toma.txt @@ -1 +1 @@ -Add Text Ludovic. +Add Text Ludovic 2. From b784e7c243c62ff403d8b46b27c2881025819bad Mon Sep 17 00:00:00 2001 From: Pedre Gabriel Date: Tue, 22 Oct 2024 09:51:10 +0400 Subject: [PATCH 5/6] resolutionconflit --- Gabriel.txt.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Gabriel.txt.txt b/Gabriel.txt.txt index a680d22..09d4d22 100644 --- a/Gabriel.txt.txt +++ b/Gabriel.txt.txt @@ -1,5 +1,3 @@ -<<<<<<< HEAD LA KPOP C'EST NUL -======= cours github expernet ->>>>>>> 8331ff78dd43c2c192752092ee9a1a70218f6a32 + From df7cc9cd642d785a100c8ae056dead35216e6652 Mon Sep 17 00:00:00 2001 From: Toma Date: Tue, 22 Oct 2024 10:10:33 +0400 Subject: [PATCH 6/6] up toma --- toma.txt => BToma/toma.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename toma.txt => BToma/toma.txt (100%) diff --git a/toma.txt b/BToma/toma.txt similarity index 100% rename from toma.txt rename to BToma/toma.txt