[Pkg-nagios-changes] [icinga] 05/06: Fix changelog

[Alexander Wirt]

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

formorer pushed a commit to branch debmon-squeeze
in repository icinga.

commit f306354e47f81b60602caf38f4b2e239e5d9c17e
Author: Alexander Wirt <formorer at debian.org>
Date:   Sun Mar 30 16:50:38 2014 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 0ca9d89..8b3f7de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,9 @@
-<<<<<<< HEAD
+icinga (1.11.1-1~debmon60+1) debmon-squeeze; urgency=medium
+
+  * Build for debmon-squeeze 
+
+ -- Alexander Wirt <formorer at debian.org>  Sun, 30 Mar 2014 16:50:10 +0200
+
 icinga (1.11.0-2~debmon60+2) debmon-squeeze; urgency=medium
 
   * [9b7f85e] Fix db file
@@ -10,7 +15,7 @@ icinga (1.11.0-2~debmon60+1) debmon-squeeze; urgency=low
   * Rebuild for debmon-squeeze
 
  -- Alexander Wirt <formorer at debian.org>  Wed, 06 Nov 2013 20:28:02 +0100
-=======
+
 icinga (1.11.1-1) unstable; urgency=high
 
   * [a8a977f] Imported Upstream version 1.11.1
@@ -18,7 +23,6 @@ icinga (1.11.1-1) unstable; urgency=high
       (This is a fix for CVE-2014-2386) 
 
  -- Alexander Wirt <formorer at debian.org>  Sun, 30 Mar 2014 13:33:43 +0200
->>>>>>> master
 
 icinga (1.11.0-2) unstable; urgency=medium
 

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