From bc7df1734f88dfe7e55f56f52d593ff129ec2282 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Tue, 27 Mar 2018 11:03:03 -0500
Subject: [PATCH] gitattributes: disable merge=union in all-packages

This would lead to some merge issues occasionally.
---
 .gitattributes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index 14bee08e381..4862e0eab93 100644
--- 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