From 8f6a5178e816689fc6bd38aebfc0cfc41aa5d37d 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.

Conflicts:

	config/rootfiles/core/58/filelists/files
---
 config/rootfiles/core/58/filelists/files | 4 ++++
 1 file changed, 4 insertions(+)

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