ae74c356d9
Let's get rid of those merge conflicts. |
||
---|---|---|
.. | ||
blivet.nix | ||
blivet.patch | ||
cryptsetup.nix | ||
default.nix | ||
dmraid.nix | ||
lvm2.nix | ||
multipath-tools.nix | ||
parted.nix | ||
pyblock.nix | ||
pykickstart.nix | ||
pyparted.nix |
ae74c356d9
Let's get rid of those merge conflicts. |
||
---|---|---|
.. | ||
blivet.nix | ||
blivet.patch | ||
cryptsetup.nix | ||
default.nix | ||
dmraid.nix | ||
lvm2.nix | ||
multipath-tools.nix | ||
parted.nix | ||
pyblock.nix | ||
pykickstart.nix | ||
pyparted.nix |