Remove stray merge marker from changelog.

diff --git a/debian/changelog b/debian/changelog
index 32a2454ba9dcc8593dd284272dc19374cdebeb39..9579933551e2f85eb7bef274b7dc407558bb626e 100644 (file)
--- 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