From f1cfa186ffc6268508adb1e5768eacc1fd22f2d8 Mon Sep 17 00:00:00 2001
From: David Waern <david.waern@gmail.com>
Date: Thu, 22 Jul 2010 19:31:28 +0000
Subject: Solve conflict

---
 src/Haddock/Utils.hs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Haddock/Utils.hs b/src/Haddock/Utils.hs
index 45c64e57..b5ef2f71 100644
--- a/src/Haddock/Utils.hs
+++ b/src/Haddock/Utils.hs
@@ -372,8 +372,9 @@ html_xrefs = unsafePerformIO (readIORef html_xrefs_ref)
 replace :: Eq a => a -> a -> [a] -> [a]
 replace a b = map (\x -> if x == a then b else x)
 
+
 spanWith :: (a -> Maybe b) -> [a] -> ([b],[a])
-spanWith p [] = ([],[])
+spanWith _ [] = ([],[])
 spanWith p xs@(a:as)
   | Just b <- p a = let (bs,cs) = spanWith p as in (b:bs,cs)
   | otherwise     = ([],xs)
-- 
cgit v1.2.3