[debian-edu-commits] debian-edu/ 01/02: cleanup changelog from changes which were only in the jessie branch and which got introduced here in f4811f89

[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 72a0ca49bbae76af871672fca734847ae468f479
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Jun 3 15:24:12 2016 +0200

    cleanup changelog from changes which were only in the jessie branch and which got introduced here in f4811f89
---
 debian/changelog | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a795c76..b6a3b39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -191,16 +191,7 @@ debian-edu-config (1.819) unstable; urgency=medium
     as empty lists. Thus, all systems can be blocked from waking-up by placing
     an empty NIS netgroup s-a-n-wakeup-hosts into LDAP.
 
-<<<<<<< HEAD
  -- Petter Reinholdtsen <pere at debian.org>  Mon, 28 Mar 2016 18:26:23 +0000
-=======
-  [ Wolfgang Schweer ]
-  * Adjust tools/subnet-change for squid3. (Closes: #800654)
-  * Fix XML syntax error in gosa.conf. (Closes: #820551).
-  * Add script sbin/debian-edu-nscd-netgroup-cache (workaround for #791562).
-
- -- Petter Reinholdtsen <pere at debian.org>  Sat, 16 May 2015 23:12:06 +0200
->>>>>>> 929400c... Add script sbin/debian-edu-nscd-netgroup-cache (workaround for #791562).
 
 debian-edu-config (1.818) unstable; urgency=high
 

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