Files
nixpkgs/.gitattributes
Matthew Justin Bauer bc7df1734f gitattributes: disable merge=union in all-packages
This would lead to some merge issues occasionally.
2018-03-27 11:03:03 -05:00

598 B