From: Peter Michael Green <plugwash@raspbian.org>
Date: Thu, 23 Jan 2020 16:49:43 +0000 (+0000)
Subject: Remove stray merge marker from changelog.
X-Git-Tag: archive/raspbian/1%68.5.0-1_deb10u1+rpi1~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=751fe717c4d7eb3df0e3bc8ba62fe9805781201b;p=thunderbird.git

Remove stray merge marker from changelog.
---

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 <c.schoenert@t-online.de>  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