fix core58 merge problem.

Conflicts:

	config/rootfiles/core/58/filelists/files
This commit is contained in:
Arne Fitzenreiter
2012-05-05 23:21:18 +02:00
parent 5479803667
commit 8f6a5178e8

View File

@@ -1,3 +1,7 @@
etc/system-release
etc/issue
etc/vimrc
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
var/ipfire/general-functions.pl
var/ipfire/langs