aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Waern <david.waern@gmail.com>2010-12-07 14:08:10 +0000
committerDavid Waern <david.waern@gmail.com>2010-12-07 14:08:10 +0000
commit37e87f52be4abd8412812e158b1762c32965598b (patch)
tree3fe0f2b655234995ff78940fc2600df607f4b6cb /src
parent0606cea86a55407c9ca6e4fcc7151fbfc95305c9 (diff)
Solve conflicts
Diffstat (limited to 'src')
-rw-r--r--src/Haddock/Lex.x1
-rw-r--r--src/Haddock/Parse.y1
2 files changed, 2 insertions, 0 deletions
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