ae74c356d9
Let's get rid of those merge conflicts. |
||
---|---|---|
.. | ||
default.nix | ||
ghcjs-boot.nix | ||
ghcjs.patch | ||
shims.nix | ||
wrapper.nix |
ae74c356d9
Let's get rid of those merge conflicts. |
||
---|---|---|
.. | ||
default.nix | ||
ghcjs-boot.nix | ||
ghcjs.patch | ||
shims.nix | ||
wrapper.nix |