From 416bf5f3f9c24b5b7e57d07e5aec0cbff1e249a6 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 29 Sep 2014 13:44:26 +0200
Subject: [PATCH] fix merge problem.

---
 config/rootfiles/{core => oldcore}/82/filelists/iputils        | 0
 config/rootfiles/{core => oldcore}/82/filelists/openssl-compat | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename config/rootfiles/{core => oldcore}/82/filelists/iputils (100%)
 rename config/rootfiles/{core => oldcore}/82/filelists/openssl-compat (100%)

diff --git a/config/rootfiles/core/82/filelists/iputils b/config/rootfiles/oldcore/82/filelists/iputils
similarity index 100%
rename from config/rootfiles/core/82/filelists/iputils
rename to config/rootfiles/oldcore/82/filelists/iputils
diff --git a/config/rootfiles/core/82/filelists/openssl-compat b/config/rootfiles/oldcore/82/filelists/openssl-compat
similarity index 100%
rename from config/rootfiles/core/82/filelists/openssl-compat
rename to config/rootfiles/oldcore/82/filelists/openssl-compat
-- 
2.39.5