cabal-install/tests/UnitTests/Distribution/Client/UserConfig.hs · b5fe957aaa4c6143917f019ea07244dc83afe97c · Glasgow Haskell Compiler / Packages / Cabal · GitLab

Oct 11, 2015
cfcfb0fe
Merge branch 'cabal-user-config' of https://github.com/grayjay/cabal into grayjay-cabal-user-config · cfcfb0fe
Duncan Coutts authored Oct 11, 2015
```
Conflicts:
	cabal-install/Distribution/Client/Config.hs
	cabal-install/tests/UnitTests/Distribution/Client/UserConfig.hs
```
cfcfb0fe
Merge branch 'cabal-user-config' of https://github.com/grayjay/cabal into grayjay-cabal-user-config
Duncan Coutts authored Oct 11, 2015
```
Conflicts:
	cabal-install/Distribution/Client/Config.hs
	cabal-install/tests/UnitTests/Distribution/Client/UserConfig.hs
```