[commit: ghc] wip/nfs-locking: Hide `parallel` from shake (aad2247)

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

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

commit aad2247ecc85160af1d27f7c4e3bb227a754630f
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sun Dec 20 21:41:07 2015 +0100

    Hide `parallel` from shake
    
    Shake `master` branch exports a symbol called `parallel` which overlaps
    with ours.


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

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

diff --git a/src/Base.hs b/src/Base.hs
index 1c72fd8..7edae37 100644
--- a/src/Base.hs
+++ b/src/Base.hs
@@ -38,7 +38,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