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/Lex.x | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/Haddock/Lex.x')

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
-- 
cgit v1.2.3