From b5c3859e301bab60fd6a1f905b52ffa3ce407d6b Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 5 May 2012 23:21:18 +0200
Subject: [PATCH] fix core58 merge problem.

---
 config/rootfiles/core/58/filelists/files | 3 ---
 1 file changed, 3 deletions(-)

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
-- 
2.39.5