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/Rename.hs | |
parent | b30f5ecfdae9dea8048c19051732b71f7633f9c9 (diff) |
Fix conflicts
Diffstat (limited to 'src/Haddock/Rename.hs')
-rw-r--r-- | src/Haddock/Rename.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Haddock/Rename.hs b/src/Haddock/Rename.hs index c8e5cc8e..6ba07215 100644 --- a/src/Haddock/Rename.hs +++ b/src/Haddock/Rename.hs @@ -11,7 +11,7 @@ module Haddock.Rename ( import Haddock.Types -import GHC +import GHC hiding ( NoLink ) import BasicTypes import SrcLoc import Bag ( emptyBag ) |