From 751fe717c4d7eb3df0e3bc8ba62fe9805781201b Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Thu, 23 Jan 2020 16:49:43 +0000 Subject: [PATCH] Remove stray merge marker from changelog. --- debian/changelog | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 32a2454ba9..9579933551 100644 --- a/debian/changelog +++ b/debian/changelog @@ -49,7 +49,6 @@ thunderbird (1:68.3.1-1) unstable; urgency=medium -- Carsten Schoenert Wed, 18 Dec 2019 15:54:44 +0100 ->>>>>>> 1%68.4.1-1_deb10u1 thunderbird (1:68.3.0-2~deb10u1) stable-security; urgency=medium * Rebuild for buster-security -- 2.30.2