Branch: refs/heads/hardened-stdenv
Home: https://github.com/NixOS/nixpkgs
Commit: 56b56c21384980ce4d83f4a5b3bcd3cedf759bdc
https://github.com/NixOS/nixpkgs/commit/56b56c21384980ce4d83f4a5b3bcd3cedf759bdc
Author: Robin Gloster <m...@glob.in>
Date: 2016-06-13 (Mon, 13 Jun 2016)
Changed paths:
M pkgs/top-level/all-packages.nix
Log Message:
-----------
fix merge failure (2)
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
