summaryrefslogtreecommitdiff
path: root/compiler/main/CodeOutput.lhs
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2012-07-04 13:19:26 +0100
committerSimon Marlow <marlowsd@gmail.com>2012-07-04 13:19:47 +0100
commit3f0afabaf3e862d986279dc041b14b61e73f86d3 (patch)
tree30b0a2dabcdbf01688040ea28128292970dc4085 /compiler/main/CodeOutput.lhs
parent99fd2469fba1a38b2a65b4694f337d92e559df01 (diff)
downloadhaskell-3f0afabaf3e862d986279dc041b14b61e73f86d3.tar.gz
Fix merge-related problems
Diffstat (limited to 'compiler/main/CodeOutput.lhs')
-rw-r--r--compiler/main/CodeOutput.lhs2
1 files changed, 0 insertions, 2 deletions
diff --git a/compiler/main/CodeOutput.lhs b/compiler/main/CodeOutput.lhs
index b4d6371a5d..3b2354479a 100644
--- a/compiler/main/CodeOutput.lhs
+++ b/compiler/main/CodeOutput.lhs
@@ -28,11 +28,9 @@ import qualified Stream
import ErrUtils
import Outputable
import Module
-import Maybes ( firstJusts )
import SrcLoc
import Control.Exception
-import Control.Monad
import System.Directory
import System.FilePath
import System.IO