fix merge problem.

author Arne Fitzenreiter <arne_f@ipfire.org>

Mon, 29 Sep 2014 11:44:26 +0000 (13:44 +0200)

committer Arne Fitzenreiter <arne_f@ipfire.org>

Mon, 29 Sep 2014 11:44:26 +0000 (13:44 +0200)
author Arne Fitzenreiter <arne_f@ipfire.org>
Mon, 29 Sep 2014 11:44:26 +0000 (13:44 +0200)
committer Arne Fitzenreiter <arne_f@ipfire.org>
Mon, 29 Sep 2014 11:44:26 +0000 (13:44 +0200)
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
author	Arne Fitzenreiter <arne_f@ipfire.org>
	Mon, 29 Sep 2014 11:44:26 +0000 (13:44 +0200)
committer	Arne Fitzenreiter <arne_f@ipfire.org>
	Mon, 29 Sep 2014 11:44:26 +0000 (13:44 +0200)
config/rootfiles/oldcore/82/filelists/iputils	[moved from config/rootfiles/core/82/filelists/iputils with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/82/filelists/openssl-compat	[moved from config/rootfiles/core/82/filelists/openssl-compat with 100% similarity]	patch \| blob \| blame \| history