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

[Alexander Wirt]

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

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

commit 83decccab9899f75b67e17640cb122e98b0cffd0
Author: Alexander Wirt <alexander.wirt at credativ.de>
Date:   Tue Dec 13 14:12:02 2016 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 3735a34..20ae5af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,9 @@
-<<<<<<< HEAD
-icinga2 (2.5.4-1~ppa1~precise2) precise; urgency=medium
+icinga2 (2.6.0-1~ppa1~precise1) precise; urgency=medium
 
   * Rebuild for my ubuntu ppa
 
  -- Alexander Wirt <formorer at debian.org>  Thu, 19 May 2016 14:31:06 +0200
-=======
+
 icinga2 (2.6.0-1) unstable; urgency=medium
 
   [ Alexander Wirt ]
@@ -29,7 +28,6 @@ icinga2 (2.5.4-2) unstable; urgency=medium
     (Closes: #836589)
 
  -- Alexander Wirt <formorer at debian.org>  Fri, 09 Sep 2016 08:59:57 +0200
->>>>>>> master
 
 icinga2 (2.5.4-1) unstable; urgency=medium
 

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