diff options
| author | David Waern <david.waern@gmail.com> | 2008-12-07 14:09:15 +0000 |
|---|---|---|
| committer | David Waern <david.waern@gmail.com> | 2008-12-07 14:09:15 +0000 |
| commit | 938168cc528aa90d2e129641feb4d35b04037fdf (patch) | |
| tree | e7a3a4c4a2076851efd9beefde25050a9b5d7248 | |
| parent | 38cb03d4bd9f4301bf50ad7ddf599c3ecffe10a5 (diff) | |
Solve conflict
| -rw-r--r-- | src/Haddock/GHC.hs | 1 |
1 files changed, 0 insertions, 1 deletions
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 } |