1e389c976c
In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix were not merged correctly. Conflicts: pkgs/stdenv/generic/default.nix |
||
---|---|---|
doc | ||
lib | ||
maintainers/scripts | ||
nixos | ||
pkgs | ||
.gitignore | ||
.version | ||
COPYING | ||
default.nix | ||
README.md |