[med-svn] [transdecoder] 03/06: Fix changelog

[Andreas Tille]

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

tille pushed a commit to branch master
in repository transdecoder.

commit a097ea2ba18a200ed6ff175633718e5d37d62bff
Author: Andreas Tille <tille at debian.org>
Date:   Fri May 20 09:58:57 2016 +0200

    Fix changelog
---
 debian/changelog | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5e92c35..79ca5e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-transdecoder (3.0.0+dfsg-1) unstable; urgency=medium
+transdecoder (3.0.0+dfsg-2) UNRELEASED; urgency=medium
 
-<<<<<<< 797c472d797b034fb8aaaaabc98597421e587041
-  * new upstream release
-=======
-  * New upstream version
   * Use xz compression for repackaged tarball
   * Simplify overrides
->>>>>>> Simplify overrides
+
+ -- Andreas Tille <tille at debian.org>  Fri, 20 May 2016 09:58:24 +0200
+
+transdecoder (3.0.0+dfsg-1) unstable; urgency=medium
+
+  * new upstream release
 
  -- Michael R. Crusoe <michael.crusoe at gmail.com>  Wed, 18 May 2016 03:03:30 -0700
 

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