From: Arne Fitzenreiter Date: Mon, 29 Sep 2014 11:44:26 +0000 (+0200) Subject: fix merge problem. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=416bf5f3f9c24b5b7e57d07e5aec0cbff1e249a6;p=people%2Fms%2Fipfire-2.x.git fix merge problem. --- 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