webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 11:13:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix core58 merge problem.

Browse Source
This commit is contained in:
Arne Fitzenreiter
2012-05-05 23:21:18 +02:00
parent 717470058f
commit b5c3859e30
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/rootfiles/core/58/filelists/files
View File

@@ -1,10 +1,7 @@
etc/system-release
etc/issue
etc/vimrc
<<<<<<< HEAD
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
var/ipfire/general-functions.pl
var/ipfire/langs
=======
>>>>>>> master