From 7fdf181234f7ba543f9757dcd1e64f1b3c4f4c0e Mon Sep 17 00:00:00 2001
From: "michael.hudson@canonical.com" <michael.hudson@canonical.com>
Date: Fri, 20 Feb 2026 12:44:02 +1300
Subject: [PATCH] fix changelog merge

---
 debian/changelog | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9821c3e3..b494beae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,10 +7,7 @@ livecd-rootfs (26.04.20) UNRELEASED; urgency=medium
   [ Allen Abraham ]
   * Make SBOM generation optional in create_manifest function.
 
- -- Michael Raymond <michael.raymond@canonical.com>  Thu, 19 Feb 2026 14:38:37 -0500
-
-livecd-rootfs (26.04.19ubuntu1) UNRELEASED; urgency=medium
-
+  [ Michael Hudson-Doyle ]
   * 030-ubuntu-live-system-seed.binary: do not run if there is no layer to
     install the system, in particular on arm64.