From d086d2a733fa0256f65038be8f2f6d10f5d1fcde Mon Sep 17 00:00:00 2001
From: David Waern <unknown>
Date: Wed, 11 Jul 2007 21:35:45 +0000
Subject: Fix conflicts

---
 src/Haddock/Html.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Haddock/Html.hs')

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 )
-- 
cgit v1.2.3