Browse Source

gitattributes: disable merge=union in all-packages

This would lead to some merge issues occasionally.
nixos-19.03
Matthew Justin Bauer 3 years ago
parent
commit
bc7df1734f
No account linked to committer's email address
1 changed files with 1 additions and 1 deletions
  1. 1
    1
      .gitattributes

+ 1
- 1
.gitattributes View File

@@ -13,4 +13,4 @@ nixos/doc/** linguist-documentation
13 13
 nixos/doc/default.nix linguist-documentation=false
14 14
 
15 15
 nixos/modules/module-list.nix merge=union
16
-pkgs/top-level/all-packages.nix merge=union
16
+# pkgs/top-level/all-packages.nix merge=union

Loading…
Cancel
Save