From 37e87f52be4abd8412812e158b1762c32965598b Mon Sep 17 00:00:00 2001 From: David Waern Date: Tue, 7 Dec 2010 14:08:10 +0000 Subject: Solve conflicts --- src/Haddock/Lex.x | 1 + src/Haddock/Parse.y | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Haddock/Lex.x b/src/Haddock/Lex.x index 86f66e2d..2f0b4cd3 100644 --- a/src/Haddock/Lex.x +++ b/src/Haddock/Lex.x @@ -8,6 +8,7 @@ -- { +{-# LANGUAGE BangPatterns #-} -- Generated by Alex {-# OPTIONS -Wwarn -w #-} -- The above warning supression flag is a temporary kludge. -- While working on this module you are encouraged to remove it and fix diff --git a/src/Haddock/Parse.y b/src/Haddock/Parse.y index 1aad3a18..4a0f8f99 100644 --- a/src/Haddock/Parse.y +++ b/src/Haddock/Parse.y @@ -1,4 +1,5 @@ { +{-# LANGUAGE BangPatterns #-} -- required for versions of Happy before 1.18.6 {-# OPTIONS -Wwarn -w #-} -- The above warning supression flag is a temporary kludge. -- While working on this module you are encouraged to remove it and fix -- cgit v1.2.3