Branch: refs/heads/staging
Home: https://github.com/NixOS/nixpkgs
Commit: ed01e0ca4f57d8abc8fbb16f7387a4f553d3fc8a
https://github.com/NixOS/nixpkgs/commit/ed01e0ca4f57d8abc8fbb16f7387a4f553d3fc8a
Author: obadz <[email protected]>
Date: 2016-08-28 (Sun, 28 Aug 2016)
Changed paths:
M pkgs/development/libraries/openssl/default.nix
Log Message:
-----------
openssl: fix merge conflict between b6dabe3 and 6e7ca92
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
