mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-10-20 12:43:19 +02:00
acd4299e75
Conflicts: pkgs/applications/networking/browsers/chromium/default.nix pkgs/top-level/all-packages.nix Merge conflicts seemed trivial, but a look from viric and aszlig would be nice. |
||
---|---|---|
.. | ||
default.nix |