Browse Source
gitattributes: disable merge=union in all-packages
This would lead to some merge issues occasionally.
nsd-state-dir
Matthew Justin Bauer
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
1 additions and
1 deletions
-
.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 |