forked from mirrors/nixpkgs
cdf426488b
Fixed trivial conflicts caused by removing rec. |
||
---|---|---|
.. | ||
apps | ||
artwork | ||
desktop | ||
granite | ||
services | ||
default.nix | ||
update.nix | ||
update.sh |
cdf426488b
Fixed trivial conflicts caused by removing rec. |
||
---|---|---|
.. | ||
apps | ||
artwork | ||
desktop | ||
granite | ||
services | ||
default.nix | ||
update.nix | ||
update.sh |