From 2521698093478a444e7e8d654e4dce8550f5571c Mon Sep 17 00:00:00 2001 From: missytake Date: Thu, 6 Nov 2025 09:30:47 +0100 Subject: [PATCH] XXX add merge conflict, don't merge this --- www/src/page-layout.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/www/src/page-layout.html b/www/src/page-layout.html index 28ffde56..b15de302 100644 --- a/www/src/page-layout.html +++ b/www/src/page-layout.html @@ -9,7 +9,11 @@ {{ config.mail_domain }} {{ pagename }} +<<<<<<< HEAD +======= + +>>>>>>> 2da7de8 (make logo slightly brighter)