[Pkg-nagios-changes] [pkg-icinga2] 02/06: 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 8a568d1bf1fd6cd435cc2dfca20aeaba69d785e1
Author: Alexander Wirt <formorer at debian.org>
Date:   Fri Aug 26 09:51:36 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index c131055..8e03151 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,9 @@
-<<<<<<< HEAD
 icinga2 (2.4.10-1~ppa1~wily1) wily; urgency=medium
 
   * Rebuild for my ubuntu ppa
 
  -- Alexander Wirt <formorer at debian.org>  Thu, 19 May 2016 14:38:41 +0200
-=======
+
 icinga2 (2.5.3-1) unstable; urgency=medium
 
   * [6cd83c4] Imported Upstream version 2.5.3
@@ -28,7 +27,6 @@ icinga2 (2.5.1-1) unstable; urgency=medium
   * [792b520] Imported Upstream version 2.5.1
 
  -- Alexander Wirt <alexander.wirt at credativ.de>  Tue, 23 Aug 2016 17:17:24 +0200
->>>>>>> master
 
 icinga2 (2.4.10-1) unstable; urgency=medium
 

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