aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Waern <david.waern@gmail.com>2007-11-11 02:09:41 +0000
committerDavid Waern <david.waern@gmail.com>2007-11-11 02:09:41 +0000
commita37df6aa14d02396f80704683f8e1a1fd59ce2b1 (patch)
tree0189d4edd65cf1d2681ccc0234e3ce57bb7e9932 /src
parent76dac89e5a2360f1fecd52d4d7083196903f7307 (diff)
Fix conflicts
Diffstat (limited to 'src')
-rw-r--r--src/Haddock/Utils.hs10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/Haddock/Utils.hs b/src/Haddock/Utils.hs
index 81834cd8..18a5e831 100644
--- a/src/Haddock/Utils.hs
+++ b/src/Haddock/Utils.hs
@@ -46,11 +46,15 @@ import Module
import PackageConfig ( stringToPackageId )
import Control.Monad ( liftM, MonadPlus(..) )
-import Data.Char ( isAlpha, isSpace, toUpper, ord )
+import Data.Char ( isAlpha, isSpace, toUpper, ord, chr )
+import Numeric ( showIntAtBase )
+import Data.Map ( Map )
+import qualified Data.Map as Map hiding ( Map )
import Data.IORef ( IORef, newIORef, readIORef )
import Data.List ( intersect, isSuffixOf, intersperse )
-import Data.Maybe ( maybeToList, fromMaybe )
-import Network.URI
+import Data.Maybe ( maybeToList, fromMaybe, isJust, fromJust )
+import Data.Word ( Word8 )
+import Data.Bits ( testBit )
import System.Environment ( getProgName )
import System.Exit ( exitWith, ExitCode(..) )
import System.IO ( hPutStr, stderr )