From 0d3a6d5371e6f7a739a9b03ece6d72eb8a3803c7 Mon Sep 17 00:00:00 2001
From: Jose Pedro Magalhaes <jpm@cs.uu.nl>
Date: Thu, 5 May 2011 09:44:43 +0200
Subject: [PATCH] Fix a previous incorrect merge.

---
 compiler/typecheck/TcSMonad.lhs |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/compiler/typecheck/TcSMonad.lhs b/compiler/typecheck/TcSMonad.lhs
index 414c63a..5f4522c 100644
--- a/compiler/typecheck/TcSMonad.lhs
+++ b/compiler/typecheck/TcSMonad.lhs
@@ -101,13 +101,12 @@ import FastString
 
 import HsBinds               -- for TcEvBinds stuff 
 import Id 
-
-import StaticFlags( opt_PprStyle_Debug )
 import TcRnTypes
+import Data.IORef
 #ifdef DEBUG
+import StaticFlags( opt_PprStyle_Debug )
 import Control.Monad( when )
 #endif
-import Data.IORef
 \end{code}
 
 
-- 
1.7.10.4