pyrox.dev / nixpkgs
lol
fork atom

gitattributes: disable merge=union in all-packages

This would lead to some merge issues occasionally.

Matthew Justin Bauer bc7df173 cd7047c4

options
unified split
Changed files
+1 -1
.gitattributes
+1 -1
.gitattributes 
···

       
13

       
13

       
 

       
nixos/doc/default.nix linguist-documentation=false


     

       
14

       
14

       
 

       



     

       
15

       
15

       
 

       
nixos/modules/module-list.nix merge=union


     

       
16

       

       
-

       
pkgs/top-level/all-packages.nix merge=union


     

       

       
16

       
+

       
# pkgs/top-level/all-packages.nix merge=union