Merge pull request #374 from HairyDude/master

Re-export (<>) from Data.Monoid in Import for GHC 7.4+
2012-06-18 15:08:32 -07:00 · 2012-06-18 15:08:32 -07:00 · f71704a7b7
commit f71704a7b7
parent 8b5fbb47af 6bb584a8ec
1 changed files with 4 additions and 0 deletions
--- a/yesod/scaffold/Import.hs.cg
+++ b/yesod/scaffold/Import.hs.cg
@ -15,7 +15,11 @@ module Import
 import Prelude hiding (writeFile, readFile, head, tail, init, last)
 import Yesod   hiding (Route(..))
 import Foundation
+#if __GLASGOW_HASKELL__ < 704
 import Data.Monoid (Monoid (mappend, mempty, mconcat))
+#else
+import Data.Monoid (Monoid (mappend, mempty, mconcat), (<>))
+#endif
 import Control.Applicative ((<$>), (<*>), pure)
 import Data.Text (Text)
 import Settings.StaticFiles