From 6c406f89d5ef923ad7e837acd30de2251555a9dc Mon Sep 17 00:00:00 2001 From: Greg Weber Date: Mon, 12 Mar 2012 13:58:57 -0700 Subject: [PATCH] use proper GHC version number. 704 means 7.4 --- scripts | 2 +- yesod/scaffold/Import.hs.cg | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts b/scripts index 6c10efcc..6a95e0a8 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit 6c10efccbad0cf12be2339171d931aeb035ef5dd +Subproject commit 6a95e0a8dbc1b3d26d58c1eaadf24d1bdaa48c8b diff --git a/yesod/scaffold/Import.hs.cg b/yesod/scaffold/Import.hs.cg index a5d5a179..bc64119d 100644 --- a/yesod/scaffold/Import.hs.cg +++ b/yesod/scaffold/Import.hs.cg @@ -6,7 +6,7 @@ module Import , module Data.Monoid , module Control.Applicative , Text -#if __GLASGOW_HASKELL__ < 740 +#if __GLASGOW_HASKELL__ < 704 , (<>) #endif ) where @@ -19,7 +19,7 @@ import Control.Applicative ((<$>), (<*>), pure) import Data.Text (Text) import Settings.StaticFiles -#if __GLASGOW_HASKELL__ < 740 +#if __GLASGOW_HASKELL__ < 704 infixr 5 <> (<>) :: Monoid m => m -> m -> m (<>) = mappend