configroot: fix merge problem.
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 1 Sep 2013 18:52:06 +0000 (20:52 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 1 Sep 2013 18:52:06 +0000 (20:52 +0200)
commitdaa3a950046faa04f88f988a42165b1f9b59ffe2
tree25cff1ad2987a6aa7403fee05c5dfd3ffd5cba11
parent4234cbe2ef4d9a1313e08c34a46d61242486fdad
configroot: fix merge problem.
config/rootfiles/common/configroot
lfs/configroot