From 938168cc528aa90d2e129641feb4d35b04037fdf Mon Sep 17 00:00:00 2001
From: David Waern <david.waern@gmail.com>
Date: Sun, 7 Dec 2008 14:09:15 +0000
Subject: Solve conflict

---
 src/Haddock/GHC.hs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/Haddock')

diff --git a/src/Haddock/GHC.hs b/src/Haddock/GHC.hs
index c53c3a83..597a6005 100644
--- a/src/Haddock/GHC.hs
+++ b/src/Haddock/GHC.hs
@@ -47,7 +47,6 @@ startGhc libDir flags = do
 #endif
     let dynflags' = dopt_set dynflags Opt_Haddock
     let dynflags'' = dynflags' {
-        hscTarget = HscAsm,
         ghcMode   = CompManager,
         ghcLink   = NoLink
       }
-- 
cgit v1.2.3