[debian-edu-commits] debian-edu/ 01/01: Fix Makefile; it's cf.firefox-esr now instead of cf.firefox.

[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 930702d93a1912aeddb8307d30b9824acd3137f8
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Thu Jul 7 13:04:02 2016 +0200

    Fix Makefile; it's cf.firefox-esr now instead of cf.firefox.
    
    (cherry picked from commit 7ffaf50f3e589c06ca22329bceb1d824e0508fce)
    
    Conflicts resolved:
    	Makefile
---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 4f46a34..c1adf32 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,8 @@ CFFILES = \
 	cf.exim \
 	cf.imap \
 	cf.homes \
-	cf.firefox \
+	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