e5917ea6fc26ecf52b5db6ccf2bb8bfc8c507854
The only conflict was the addition of two different options at the same place. svn path=/nixos/trunk/; revision=28801
*** NixOS *** NixOS is a Linux distribution based on the purely functional package management system Nix. More information can be found at http://nixos.org/nixos and in the manual in doc/manual.
Languages
Nix
95%
Shell
2%
Python
1.8%
Rust
0.3%
JavaScript
0.2%
Other
0.4%