[med-svn] [picard-tools] 06/06: Cleanup d/changelog after unsuccessful merge

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository picard-tools.

commit bd3256efbaff5143e2a96f2abe90353045978c30
Author: Andreas Tille <tille at debian.org>
Date:   Sun Feb 21 19:51:03 2016 +0100

    Cleanup d/changelog after unsuccessful merge
---
 debian/changelog | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6fca29e..aa19969 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,16 +3,13 @@ picard-tools (2.1.0+dfsg-1) UNRELEASED; urgency=medium
   * New upstream version
   * Adapt debian/watch to use xz compression
   * Remove Shaun Jackman and add myself as Uploader
-<<<<<<< 77fac7dfaf1ddc33dc96096e7f0747b3523a49f0
+  * cme fix dpkg-control
  
   [ Steffen Moeller and Jon Ison ]
   * Added EDAM annotation to debian/upstream/edam
 
-=======
-  * cme fix dpkg-control
   TODO: Could not load definitions from resource org/jacoco/ant/antlib.xml. It could not be found.
   
->>>>>>> cme fix dpkg-control
  -- Andreas Tille <tille at debian.org>  Sun, 21 Feb 2016 19:04:03 +0100
 
 picard-tools (1.138+dfsg.1-1) unstable; urgency=medium

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/picard-tools.git