mirror of
https://github.com/typeable/nixpkgs.git
synced 2024-09-11 11:57:32 +03:00
gitattributes: disable merge=union in all-packages
This would lead to some merge issues occasionally.
This commit is contained in:
parent
cd7047c461
commit
bc7df1734f
2
.gitattributes
vendored
2
.gitattributes
vendored
@ -13,4 +13,4 @@ nixos/doc/** linguist-documentation
|
||||
nixos/doc/default.nix linguist-documentation=false
|
||||
|
||||
nixos/modules/module-list.nix merge=union
|
||||
pkgs/top-level/all-packages.nix merge=union
|
||||
# pkgs/top-level/all-packages.nix merge=union
|
||||
|
Loading…
Reference in New Issue
Block a user