From a46d737136750279129e01dc8a996c18d88f00c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Kh=C3=A9lifi?= Date: Mon, 7 Oct 2024 14:18:50 +0200 Subject: [PATCH 1/2] Fix conflicts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Bruno Khélifi --- 404.html | 18 ++++++++++++++++-- CoC.html | 19 ++++++++++++++++--- about.html | 18 ++++++++++++++++-- acknowledging.html | 20 +++++++++++++++++--- contact.html | 19 ++++++++++++++++--- contribute.html | 19 ++++++++++++++++--- cta.html | 18 ++++++++++++++++-- index.html | 28 ++++++++++++++++++++++++++-- news.html | 19 ++++++++++++++++--- team.html | 18 ++++++++++++++++-- 10 files changed, 171 insertions(+), 25 deletions(-) diff --git a/404.html b/404.html index 690057c..887801d 100644 --- a/404.html +++ b/404.html @@ -2,7 +2,7 @@ - + + + + diff --git a/CoC.html b/CoC.html index 3b7146d..a015668 100644 --- a/CoC.html +++ b/CoC.html @@ -2,7 +2,7 @@ - + + + + diff --git a/about.html b/about.html index 33ade79..9464189 100644 --- a/about.html +++ b/about.html @@ -12,7 +12,7 @@ - + + + + diff --git a/acknowledging.html b/acknowledging.html index 4d4c3dd..0aca0a0 100644 --- a/acknowledging.html +++ b/acknowledging.html @@ -12,7 +12,7 @@ - + + + + @@ -117,7 +131,7 @@