wip
/
nixpkgs
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

gitattributes: disable merge=union in all-packages 

This would lead to some merge issues occasionally.
wip-nanopi-m4v2
Matthew Justin Bauer 8 years ago
committed by GitHub
parent
cd7047c461
commit
bc7df1734f
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      .gitattributes

+ 1
- 1
.gitattributes View File

@@ -13,4 +13,4 @@ nixos/doc/** linguist-documentation
nixos/doc/default.nix linguist-documentation=false nixos/doc/default.nix linguist-documentation=false


nixos/modules/module-list.nix merge=union nixos/modules/module-list.nix merge=union
pkgs/top-level/all-packages.nix merge=union
# pkgs/top-level/all-packages.nix merge=union

Write Preview
Loading…
Cancel
Save