From 1c5de1663ef563b2c0b5c2cd59268acec3e86fdb Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 3 Oct 2022 16:00:26 +0200 Subject: Fix bad merge for changelog docs --- docs/changelog/css/combo.css | 3 --- docs/changelog/template.html | 3 --- 2 files changed, 6 deletions(-) (limited to 'docs') diff --git a/docs/changelog/css/combo.css b/docs/changelog/css/combo.css index 5e2eafa2b..a53207390 100644 --- a/docs/changelog/css/combo.css +++ b/docs/changelog/css/combo.css @@ -889,12 +889,9 @@ 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; } -======= ->>>>>>> 9cba51606 (Generate html CHANGELOG) diff --git a/docs/changelog/template.html b/docs/changelog/template.html index 7fe4d754d..309f517ce 100644 --- a/docs/changelog/template.html +++ b/docs/changelog/template.html @@ -9,12 +9,9 @@ -<<<<<<< HEAD -=======

->>>>>>> 9cba51606 (Generate html CHANGELOG)

$body$

-- cgit v1.2.3