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/template.html | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'docs/changelog/template.html') 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