[commit: ghc] wip/nfs-locking: Merge pull request #136 from quchen/redundant-hiding (4116dbd)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/4116dbdd0c3407fac56a101e2592240411108c86/ghc

>---------------------------------------------------------------

commit 4116dbdd0c3407fac56a101e2592240411108c86
Merge: b3382b9 988dabb
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Fri Jan 8 17:29:30 2016 +0000

    Merge pull request #136 from quchen/redundant-hiding
    
    Fix unnecessary import hiding of "parallel" [skip ci]



>---------------------------------------------------------------

4116dbdd0c3407fac56a101e2592240411108c86
 src/Base.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)