[commit: ghc] wip/nfs-locking: Base: Hide `parallel` (ef0386c)

[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/ef0386c76790b582cb180d5db224d0b4681ae4ba/ghc

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

commit ef0386c76790b582cb180d5db224d0b4681ae4ba
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Dec 24 14:17:54 2015 +0100

    Base: Hide `parallel`
    
    Otherwise it is shadowed by `GHC.parallel`


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

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

diff --git a/src/Base.hs b/src/Base.hs
index 55c1a9e..47a4285 100644
--- a/src/Base.hs
+++ b/src/Base.hs
@@ -39,7 +39,7 @@ import Data.Function
 import Data.List
 import Data.Maybe
 import Data.Monoid
-import Development.Shake hiding (unit, (*>))
+import Development.Shake hiding (unit, (*>), parallel)
 import Development.Shake.Classes
 import Development.Shake.Config
 import Development.Shake.FilePath