[Pkg-nagios-changes] [icinga] 02/02: Fix changelog

[Alexander Wirt]

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

formorer pushed a commit to annotated tag debian/1.10.1-1_debmon70+1
in repository icinga.

commit c0c5a9597eb985b76ab41f76cedccda43e87df5e
Author: Alexander Wirt <formorer at debian.org>
Date:   Wed Nov 6 20:54:30 2013 +0100

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

diff --git a/debian/changelog b/debian/changelog
index a20a5d0..f4db496 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,9 @@
-<<<<<<< HEAD
-icinga (1.9.3-2~debmon70+1) debmon-wheezy; urgency=low
+icinga (1.10.1-1~debmon70+1) debmon-wheezy; urgency=low
 
   * Rebuild for debmon
 
  -- Alexander Wirt <formorer at debian.org>  Mon, 14 Jan 2013 21:55:21 +0100
-=======
+
 icinga (1.10.1-1) unstable; urgency=low
 
   * [2b8968a] Install sql upgrade files for 1.10
@@ -24,7 +23,6 @@ icinga (1.10.0-1) unstable; urgency=low
   * [604c4f6] Bump standards version
 
  -- Alexander Wirt <formorer at debian.org>  Thu, 24 Oct 2013 17:26:19 +0200
->>>>>>> master
 
 icinga (1.9.3-2) unstable; urgency=low
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/icinga.git