From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 5 May 2012 21:21:18 +0000 (+0200)
Subject: fix core58 merge problem.
X-Git-Tag: v2.11-core61^2~53^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5c3859e301bab60fd6a1f905b52ffa3ce407d6b;p=people%2Fms%2Fipfire-2.x.git

fix core58 merge problem.
---

diff --git a/config/rootfiles/core/58/filelists/files b/config/rootfiles/core/58/filelists/files
index 19d98e57cf..047127e7e5 100644
--- 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