From c2ee1d4cbec240450379aa863ffec4644796a85d Mon Sep 17 00:00:00 2001 From: Greg Weber Date: Wed, 29 Feb 2012 09:42:50 -0800 Subject: [PATCH] 7.4 ships with (<>) = mappend --- yesod/scaffold/Import.hs.cg | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/yesod/scaffold/Import.hs.cg b/yesod/scaffold/Import.hs.cg index 7fdd7160..9bc7ce06 100644 --- a/yesod/scaffold/Import.hs.cg +++ b/yesod/scaffold/Import.hs.cg @@ -2,11 +2,13 @@ module Import ( module Prelude , module Yesod , module Foundation - , (<>) - , Text , module Data.Monoid , module Control.Applicative , module Settings.StaticFiles + , Text +#if __GLASGOW_HASKELL__ <= 740 + , (<>) +#endif ) where import Prelude hiding (writeFile, readFile, head, tail, init, last) @@ -17,6 +19,8 @@ import Control.Applicative ((<$>), (<*>), pure) import Data.Text (Text) import Settings.StaticFiles +#if __GLASGOW_HASKELL__ <= 740 infixr 5 <> (<>) :: Monoid m => m -> m -> m (<>) = mappend +#endif