fix core58 merge problem.

diff --git a/config/rootfiles/core/58/filelists/files b/config/rootfiles/core/58/filelists/files
index 19d98e57cf666d6bd31c6ce3da16b59942d92c45..047127e7e540163ff1e298e2f6e55a09b7b68574 100644 (file)
--- a/config/rootfiles/core/58/filelists/files
+++ b/config/rootfiles/core/58/filelists/files
@@ -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