ae74c356d9
Let's get rid of those merge conflicts. |
||
---|---|---|
.. | ||
desktop-managers | ||
display-managers | ||
hardware | ||
window-managers | ||
redshift.nix | ||
terminal-server.nix | ||
unclutter.nix | ||
xfs.conf | ||
xfs.nix | ||
xserver.nix |
ae74c356d9
Let's get rid of those merge conflicts. |
||
---|---|---|
.. | ||
desktop-managers | ||
display-managers | ||
hardware | ||
window-managers | ||
redshift.nix | ||
terminal-server.nix | ||
unclutter.nix | ||
xfs.conf | ||
xfs.nix | ||
xserver.nix |