[commit: ghc] master: Fix rebase fallout (8b9f71e)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/8b9f71ee984355678d20e1505be1d822a3b9cd12/ghc

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

commit 8b9f71ee984355678d20e1505be1d822a3b9cd12
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sat Sep 14 00:07:46 2013 +0200

    Fix rebase fallout
    
    To push what was validated, not just what was commited.


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

8b9f71ee984355678d20e1505be1d822a3b9cd12
 compiler/typecheck/TcInteract.lhs |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/typecheck/TcInteract.lhs b/compiler/typecheck/TcInteract.lhs
index 6154416..87ea04d 100644
--- a/compiler/typecheck/TcInteract.lhs
+++ b/compiler/typecheck/TcInteract.lhs
@@ -48,7 +48,7 @@ import Maybes( orElse )
 import Bag
 
 import Control.Monad ( foldM )
-import Data.Maybe ( catMaybes, mapPaybe )
+import Data.Maybe ( catMaybes, mapMaybe )
 
 import VarEnv