From 37e87f52be4abd8412812e158b1762c32965598b Mon Sep 17 00:00:00 2001
From: David Waern <david.waern@gmail.com>
Date: Tue, 7 Dec 2010 14:08:10 +0000
Subject: Solve conflicts

---
 src/Haddock/Parse.y | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/Haddock/Parse.y')

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