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