[commit: ghc] wip/nfs-locking: Do not hide Shake.parallel (we no longer have conflicting Way.parallel). (cfb1331)

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

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

commit cfb1331d6c0f338fb3998c6fd3a25759fbd9f4c9
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Tue Feb 16 00:08:25 2016 +0000

    Do not hide Shake.parallel (we no longer have conflicting Way.parallel).


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

cfb1331d6c0f338fb3998c6fd3a25759fbd9f4c9
 src/Base.hs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Base.hs b/src/Base.hs
index 464c1c9..1a06120 100644
--- a/src/Base.hs
+++ b/src/Base.hs
@@ -1,5 +1,3 @@
-{-# OPTIONS_GHC -fno-warn-dodgy-imports #-} -- for Development.Shake.parallel
-
 module Base (
     -- * General utilities
     module Control.Applicative,
@@ -35,7 +33,7 @@ import Data.Function
 import Data.List.Extra
 import Data.Maybe
 import Data.Monoid
-import Development.Shake hiding (parallel, unit, (*>), Normal)
+import Development.Shake hiding (unit, (*>), Normal)
 import Development.Shake.Classes
 import Development.Shake.FilePath
 import System.Console.ANSI