mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
292fb98d96
I made a mistake during conflict resolution in
|
||
---|---|---|
.. | ||
default.nix | ||
imagetragick.patch |