From 806be2d0f124afb7117b8b0689818c043ef3609e Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 14 Mar 2022 11:55:35 +0100 Subject: Generate html CHANGELOG --- docs/changelog/css/combo.css | 5 ++++- docs/changelog/template.html | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'docs/changelog') diff --git a/docs/changelog/css/combo.css b/docs/changelog/css/combo.css index 1a41b8c9d..5e2eafa2b 100644 --- a/docs/changelog/css/combo.css +++ b/docs/changelog/css/combo.css @@ -889,9 +889,12 @@ nav ul li:hover, nav ul li.active { } } +<<<<<<< HEAD body { background-image: url("https://ishtar-archeo.net/changelog/img/iggdrasil.png"); background-repeat: no-repeat; background-position: calc(100% - 20px) 20px; margin: 40px; -} \ No newline at end of file +} +======= +>>>>>>> 9cba51606 (Generate html CHANGELOG) diff --git a/docs/changelog/template.html b/docs/changelog/template.html index 2a6361ba7..7fe4d754d 100644 --- a/docs/changelog/template.html +++ b/docs/changelog/template.html @@ -9,6 +9,12 @@ +<<<<<<< HEAD +======= +
+

+
+>>>>>>> 9cba51606 (Generate html CHANGELOG)
$body$
-- cgit v1.2.3