[Pkg-nagios-changes] [pkg-icinga2] 01/08: Fix changelog

[Alexander Wirt]

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

formorer pushed a commit to branch ubuntu
in repository pkg-icinga2.

commit 249d0d549a63f70c4d68d2d5fba7d4752a7f507b
Author: Alexander Wirt <formorer at debian.org>
Date:   Fri Nov 21 15:35:10 2014 +0100

    Fix changelog
---
 debian/changelog | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 360f3bc..e08d07a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ icinga2 (2.2.0-1~ppa1~trusty1) trusty; urgency=medium
 
   * Rebuild for my ubuntu ppa
 
- -- Alexander Wirt <formorer at debian.org>  Mon, 16 Jun 2014 16:52:55 +0200
+ -- Alexander Wirt <formorer at debian.org>  Fri, 21 Nov 2014 15:35:04 +0100
 
 icinga2 (2.2.0-1) unstable; urgency=medium
 
@@ -141,7 +141,6 @@ icinga2 (2.0.1-1) unstable; urgency=medium
   * [5aaa17c] Fix some lintian warnings
 
  -- Alexander Wirt <formorer at debian.org>  Mon, 14 Jul 2014 20:33:58 +0200
->>>>>>> master
 
 icinga2 (2.0.0-1) unstable; urgency=low
 

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