[debian-edu-commits] debian-edu/ 01/01: Really resolve conficts in Makefile.

[Wolfgang Schweer]

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

schweer-guest pushed a commit to branch jessie
in repository debian-edu-config.

commit f2810932e5462753320bae805eec17f07056b8b3
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Thu Jul 7 13:16:49 2016 +0200

    Really resolve conficts in Makefile.
---
 Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile b/Makefile
index c1adf32..a1ea964 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,6 @@ CFFILES = \
 	cf.imap \
 	cf.homes \
 	cf.firefox-esr \
-	cf.grub \
 	cf.inetd \
 	cf.kdm \
 	cf.krb5client \

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