gitattributes: disable merge=union in all-packages

This would lead to some merge issues occasionally.
damien-biasotto · Mar 27, 2018 · bc7df17 · bc7df17
1 parent cd7047c
commit bc7df17
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.gitattributes b/.gitattributes
@@ -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