Remove stray conflict marker from changelog.

diff --git a/debian/changelog b/debian/changelog
index 0fe642acd238f95d94660668a9e8bfa8d8a30a76..62ace806553c00aec077fd11e9698f1968ac4202 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -348,7 +348,6 @@ ceph (14.2.4-1) unstable; urgency=medium
 
  -- Bernd Zeimetz <bzed@debian.org>  Mon, 18 Nov 2019 14:18:10 +0100
 
->>>>>>> becb10737
 ceph (12.2.11+dfsg1-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.