Branch: refs/heads/staging
Home: https://github.com/NixOS/nixpkgs
Commit: 54a76b3f5d8305dccecb2d6e85f3cb3bc735134a
https://github.com/NixOS/nixpkgs/commit/54a76b3f5d8305dccecb2d6e85f3cb3bc735134a
Author: Vladimír Čunát <[email protected]>
Date: 2016-10-13 (Thu, 13 Oct 2016)
Changed paths:
M nixos/doc/manual/release-notes/rl-1703.xml
Log Message:
-----------
release-notes: fixup bad conflict resolution in bef6bef
/cc #19324.
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
