-
https://github.com/grayjay/cabalDuncan Coutts authored
Conflicts: cabal-install/Distribution/Client/Config.hs cabal-install/tests/UnitTests/Distribution/Client/UserConfig.hs
cfcfb0fe
Conflicts: cabal-install/Distribution/Client/Config.hs cabal-install/tests/UnitTests/Distribution/Client/UserConfig.hs