From c7dd04788af91c3c3b61605becd04542f901a21b Mon Sep 17 00:00:00 2001 From: Kev-Roche Date: Tue, 28 Feb 2023 21:57:25 +0100 Subject: [PATCH 1/7] test --- readme/DESCRIPTION.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/readme/DESCRIPTION.rst b/readme/DESCRIPTION.rst index f480a39..d2520f5 100644 --- a/readme/DESCRIPTION.rst +++ b/readme/DESCRIPTION.rst @@ -1,3 +1,4 @@ 1. mettre une image dans static/src/img 2. mettre son nom ligne 8 dans static/src/css/custom_background.scss par exemple : background: url("../img/randonnee-montagne-tohapi.jpg"); +test From 55129448a2e7cc1d0d0bea554530a70bd7e6e958 Mon Sep 17 00:00:00 2001 From: Kev-Roche Date: Tue, 28 Feb 2023 22:02:24 +0100 Subject: [PATCH 2/7] test2 --- readme/DESCRIPTION.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/readme/DESCRIPTION.rst b/readme/DESCRIPTION.rst index d2520f5..9730b95 100644 --- a/readme/DESCRIPTION.rst +++ b/readme/DESCRIPTION.rst @@ -2,3 +2,4 @@ 2. mettre son nom ligne 8 dans static/src/css/custom_background.scss par exemple : background: url("../img/randonnee-montagne-tohapi.jpg"); test +test2 From fda4860e3aa8d6dea3ffcdc4ac24d5e8e92641da Mon Sep 17 00:00:00 2001 From: Kev-Roche Date: Tue, 28 Feb 2023 22:11:37 +0100 Subject: [PATCH 3/7] test3 --- readme/DESCRIPTION.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/readme/DESCRIPTION.rst b/readme/DESCRIPTION.rst index 9730b95..c886b17 100644 --- a/readme/DESCRIPTION.rst +++ b/readme/DESCRIPTION.rst @@ -3,3 +3,5 @@ par exemple : background: url("../img/randonnee-montagne-tohapi.jpg"); test test2 +test3 + From 195f1b36c58e9224cf96a6937f9c1c1bbcaf3a63 Mon Sep 17 00:00:00 2001 From: Kev-Roche Date: Tue, 28 Feb 2023 22:13:19 +0100 Subject: [PATCH 4/7] test 4 --- readme/DESCRIPTION.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/readme/DESCRIPTION.rst b/readme/DESCRIPTION.rst index c886b17..7837916 100644 --- a/readme/DESCRIPTION.rst +++ b/readme/DESCRIPTION.rst @@ -4,4 +4,5 @@ test test2 test3 +test4 From 4b986b0cd40181ebbb63c16dc90d79ee553161e6 Mon Sep 17 00:00:00 2001 From: Kev-Roche Date: Tue, 28 Feb 2023 22:15:46 +0100 Subject: [PATCH 5/7] change directement dans gitlab --- readme/DESCRIPTION.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme/DESCRIPTION.rst b/readme/DESCRIPTION.rst index 7837916..cbdb20f 100644 --- a/readme/DESCRIPTION.rst +++ b/readme/DESCRIPTION.rst @@ -5,4 +5,4 @@ test test2 test3 test4 - +je change dans gilab directement From a5fa09dcf6612f15f1a0791874f1f84f1f994bad Mon Sep 17 00:00:00 2001 From: Kev-Roche Date: Tue, 28 Feb 2023 22:16:20 +0100 Subject: [PATCH 6/7] conflict here --- readme/DESCRIPTION.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme/DESCRIPTION.rst b/readme/DESCRIPTION.rst index 7837916..c17bd7a 100644 --- a/readme/DESCRIPTION.rst +++ b/readme/DESCRIPTION.rst @@ -5,4 +5,4 @@ test test2 test3 test4 - +ca va conflict From d1365f32fb1e28793ea6cef010e3911ab2a2ada2 Mon Sep 17 00:00:00 2001 From: Kev-Roche Date: Tue, 28 Feb 2023 22:44:45 +0100 Subject: [PATCH 7/7] new commit from gitlab --- readme/DESCRIPTION.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/readme/DESCRIPTION.rst b/readme/DESCRIPTION.rst index 2f72d0d..2ce0a22 100644 --- a/readme/DESCRIPTION.rst +++ b/readme/DESCRIPTION.rst @@ -7,3 +7,4 @@ test3 test4 je change dans gilab directement ca va conflict +new commit from gitlab