[debian-edu-commits] debian-edu/ 01/01: fix forgotten Makefile conflict issue.

[Wolfgang Schweer]

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

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

commit 3810348a3518f6171855e066922c042c53c1a86a
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Mon Aug 8 22:01:48 2016 +0200

    fix forgotten Makefile conflict issue.
---
 Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile b/Makefile
index bf3eb63..a083d4f 100644
--- a/Makefile
+++ b/Makefile
@@ -455,7 +455,6 @@ install: install-testsuite
 		share/debian-edu-config/rsyslog-collector \
 		share/debian-edu-config/firefox-networked-prefs.js \
 		share/debian-edu-config/squid3.conf \
-		share/firefox-esr/browser/defaults/preferences/debian-edu.js \
 		share/pam-configs/edu-group \
 		share/pam-configs/edu-umask \
 		share/perl5/Debian/Edu.pm \

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