e5917ea6fc
The only conflict was the addition of two different options at the same place. svn path=/nixos/trunk/; revision=28801 |
||
---|---|---|
.. | ||
kernel.nix | ||
luksroot.nix | ||
modprobe.nix | ||
stage-1-init.sh | ||
stage-1.nix | ||
stage-2-init.sh | ||
stage-2.nix |