Browse Source

gitattributes: disable merge=union in all-packages

This would lead to some merge issues occasionally.
nixos-19.03
Matthew Justin Bauer 4 years ago committed by GitHub
parent
commit
bc7df1734f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      .gitattributes

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…
Cancel
Save