[clhep] 07/07: Finalize d/changelog

[Ole Streicher]

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

olebole pushed a commit to branch master
in repository clhep.

commit caaf56f016591e488028084518b967d8a9e31dba
Author: Ole Streicher <olebole at debian.org>
Date:   Tue Feb 7 12:01:58 2017 +0100

    Finalize d/changelog
---
 debian/changelog | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3b3f0ee..bb33539 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-clhep (2.1.4.1+dfsg-1) UNRELEASED; urgency=medium
+clhep (2.1.4.1+dfsg-1) unstable; urgency=medium
 
+  [ Andreas Tille ]
   * Team upload
   * Replace psfig by graphicx
     Closes: #820797
   * DEP5 copyright to enable using Files-Excluded: */psfig.sty
 
- -- Andreas Tille <tille at debian.org>  Fri, 20 Jan 2017 11:21:20 +0100
+ -- Ole Streicher <olebole at debian.org>  Tue, 07 Feb 2017 12:01:31 +0100
 
 clhep (2.1.4.1-1.2) unstable; urgency=medium
 
@@ -29,7 +30,6 @@ clhep (2.1.4.1-1) unstable; urgency=low
   * Canonical VCS-* fields.
 
  -- Lifeng Sun <lifongsun at gmail.com>  Sat, 14 Dec 2013 16:33:36 +0800
->>>>>>> master_new
 
 clhep (2.1.3.1-1) unstable; urgency=low
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clhep.git