Permalink
Browse files

Fixed conflicts with lens HEAD

  • Loading branch information...
1 parent e96dac5 commit 435d086a37ee6dfd7079301ba9779cea0aae7829 @ekmett committed Jan 10, 2013
Showing with 2 additions and 2 deletions.
  1. +1 −1 src/Text/Trifecta/Highlight.hs
  2. +1 −1 src/Text/Trifecta/Parser.hs
@@ -97,7 +97,7 @@ instance Ord (Located a) where
compare (_ :@ m) (_ :@ n) = compare m n
instance ToMarkup HighlightedRope where
- toMarkup (HighlightedRope intervals r) = pre $ go 0 lbs effects where
+ toMarkup (HighlightedRope intervals r) = Html5.pre $ go 0 lbs effects where
lbs = L.fromChunks [bs | Strand bs _ <- F.toList (strands r)]
ln no = Html5.a ! name (toValue $ "line-" ++ show no) $ Empty
effects = sort $ [ i | (Interval lo hi, tok) <- intersections mempty (delta r) intervals
@@ -42,7 +42,7 @@ module Text.Trifecta.Parser
) where
import Control.Applicative as Alternative
-import Control.Lens
+import Control.Lens hiding (snoc, cons)
import Control.Monad (MonadPlus(..), ap, join, guard)
import Data.ByteString as Strict hiding (empty, snoc)
import Data.ByteString.UTF8 as UTF8

0 comments on commit 435d086

Please sign in to comment.