[debian-edu-commits] debian-edu/ 02/02: add changelog entry for changelog cleanup

[Holger Levsen]

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

holger pushed a commit to branch master
in repository debian-edu-config.

commit 79ad7ccd10530f9fc396792d28e0770d8b1e14bc
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Jun 3 15:26:05 2016 +0200

    add changelog entry for changelog cleanup
---
 debian/changelog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b6a3b39..c75267e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ debian-edu-config (1.904) UNRELEASED; urgency=medium
       Jessie.
     - remove workaround (which was commented out and not used even in Jessie)
       modifying /etc/nslcd.conf.
+  * Cleanup debian/changelog which in 1.903 was accidently polluted by
+    cherry-picking without resolving all conflicts.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Mon, 30 May 2016 16:32:50 +0200
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git