ae74c356d9
Let's get rid of those merge conflicts. |
||
---|---|---|
.. | ||
cloud-init.nix | ||
dbus.nix | ||
kerberos.nix | ||
nscd.conf | ||
nscd.nix | ||
uptimed.nix |
ae74c356d9
Let's get rid of those merge conflicts. |
||
---|---|---|
.. | ||
cloud-init.nix | ||
dbus.nix | ||
kerberos.nix | ||
nscd.conf | ||
nscd.nix | ||
uptimed.nix |