haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #374 from HairyDude/master

Browse Source 
Re-export (<>) from Data.Monoid in Import for GHC 7.4+
This commit is contained in:
Luite Stegeman 2012-06-18 15:08:32 -07:00
commit f71704a7b7
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yesod/scaffold/Import.hs.cg
View File

@ -15,7 +15,11 @@ module Import
import Prelude hiding (writeFile, readFile, head, tail, init, last) import Prelude hiding (writeFile, readFile, head, tail, init, last)
import Yesod hiding (Route(..)) import Yesod hiding (Route(..))
import Foundation import Foundation
#if __GLASGOW_HASKELL__ < 704
import Data.Monoid (Monoid (mappend, mempty, mconcat)) import Data.Monoid (Monoid (mappend, mempty, mconcat))
#else
import Data.Monoid (Monoid (mappend, mempty, mconcat), (<>))
#endif
import Control.Applicative ((<$>), (<*>), pure) import Control.Applicative ((<$>), (<*>), pure)
import Data.Text (Text) import Data.Text (Text)
import Settings.StaticFiles import Settings.StaticFiles