瀏覽代碼
gitattributes: disable merge=union in all-packages
This would lead to some merge issues occasionally.
wip-nanopi-m4v2
Matthew Justin Bauer
8 年之前
committed by
GitHub
沒有發現已知的金鑰在資料庫的簽署中
GPG Key ID: 4AEE18F83AFDEB23
共有
1 個文件被更改，包括
1 次插入 和
1 次删除
-
.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 |
