From: Peter Michael Green <plugwash@raspbian.org>
Date: Fri, 17 Jan 2020 02:46:40 +0000 (+0000)
Subject: Remove stray conflict marker from changelog.
X-Git-Tag: archive/raspbian/14.2.6-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a3902de2ea467c72b90128440a9aa7e148ccb4c6;p=ceph.git

Remove stray conflict marker from changelog.
---

diff --git a/debian/changelog b/debian/changelog
index 0fe642acd..62ace8065 100644
--- 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.