diff options
| author | David Waern <unknown> | 2007-07-11 21:35:45 +0000 |
|---|---|---|
| committer | David Waern <unknown> | 2007-07-11 21:35:45 +0000 |
| commit | d086d2a733fa0256f65038be8f2f6d10f5d1fcde (patch) | |
| tree | b18ca8dbfd371a02d37cea19072264f5720fb9b9 /src/Haddock/Html.hs | |
| parent | b30f5ecfdae9dea8048c19051732b71f7633f9c9 (diff) | |
Fix conflicts
Diffstat (limited to 'src/Haddock/Html.hs')
| -rw-r--r-- | src/Haddock/Html.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Haddock/Html.hs b/src/Haddock/Html.hs index c89485bc..c6b4edf0 100644 --- a/src/Haddock/Html.hs +++ b/src/Haddock/Html.hs @@ -33,7 +33,7 @@ import Debug.Trace ( trace ) import Data.Map ( Map ) import qualified Data.Map as Map hiding ( Map ) -import GHC +import GHC hiding ( NoLink ) import Name import Module import PackageConfig ( stringToPackageId ) |