Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: 5e5ecb7b6f476af51dcad4ac05b556a3860cad6f
https://github.com/NixOS/nixpkgs/commit/5e5ecb7b6f476af51dcad4ac05b556a3860cad6f
Author: Jakob Gillich <[email protected]>
Date: 2016-01-05 (Tue, 05 Jan 2016)
Changed paths:
M pkgs/shells/fish/default.nix
Log Message:
-----------
fish: fix merge conflict
patches got duplicated
Commit: 420f55542cd9935ac50311b8bfac1684d59b4e6d
https://github.com/NixOS/nixpkgs/commit/420f55542cd9935ac50311b8bfac1684d59b4e6d
Author: Arseniy Seroka <[email protected]>
Date: 2016-01-06 (Wed, 06 Jan 2016)
Changed paths:
M pkgs/shells/fish/default.nix
Log Message:
-----------
Merge pull request #12167 from jgillich/fish-merge-fix
fish: fix merge conflict
Compare: https://github.com/NixOS/nixpkgs/compare/ce8c8f1e1b44...420f55542cd9_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
