[Pkg-nagios-changes] [icinga] 01/01: 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 b930c233869af29ebd02a4e44bdd0197146ca017
Author: Alexander Wirt <formorer at debian.org>
Date:   Tue May 27 08:59:41 2014 +0200

    Fix changelog
---
 debian/changelog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5527d1a..da39a37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,7 +21,6 @@ icinga (1.11.3-2) unstable; urgency=medium
   * [b8c228e] Install schema for 1.11.3
 
  -- Alexander Wirt <formorer at debian.org>  Wed, 21 May 2014 14:10:22 +0200
->>>>>>> master
 
 icinga (1.11.3-1) unstable; urgency=medium
 

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