f67d5a9a39
Conflicts have been resolved in: pkgs/tools/misc/file/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/python-packages.nix |
||
---|---|---|
doc | ||
maintainers | ||
pkgs | ||
.gitignore | ||
COPYING | ||
default.nix | ||
VERSION |
f67d5a9a39
Conflicts have been resolved in: pkgs/tools/misc/file/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/python-packages.nix |
||
---|---|---|
doc | ||
maintainers | ||
pkgs | ||
.gitignore | ||
COPYING | ||
default.nix | ||
VERSION |