diff options
| author | Jasper Van der Jeugt <m@jaspervdj.be> | 2013-03-11 15:53:00 +0100 |
|---|---|---|
| committer | Jasper Van der Jeugt <m@jaspervdj.be> | 2013-03-11 15:53:00 +0100 |
| commit | d840363bf0edbbd703e1a7d2e2700c5feeedbbc6 (patch) | |
| tree | 7f221ffab1025ab4c316ab404e73449fa8477f1d /src/Hakyll | |
| parent | 5c053d4c7106b5fe894263281ec7501ec5293bb6 (diff) | |
| parent | d6f6657c28f0ae4f82a249db0f6ce01482319713 (diff) | |
| download | hakyll-d840363bf0edbbd703e1a7d2e2700c5feeedbbc6.tar.gz | |
Merge remote-tracking branch 'piyush-kurur/master'
Conflicts:
hakyll.cabal
Diffstat (limited to 'src/Hakyll')
| -rw-r--r-- | src/Hakyll/Core/Configuration.hs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/Hakyll/Core/Configuration.hs b/src/Hakyll/Core/Configuration.hs index fdca879..5382b6d 100644 --- a/src/Hakyll/Core/Configuration.hs +++ b/src/Hakyll/Core/Configuration.hs @@ -8,6 +8,7 @@ module Hakyll.Core.Configuration -------------------------------------------------------------------------------- +import Data.Default (Default(..)) import Data.List (isPrefixOf, isSuffixOf) import System.FilePath (normalise, takeFileName) @@ -56,6 +57,9 @@ data Configuration = Configuration inMemoryCache :: Bool } +-------------------------------------------------------------------------------- +instance Default Configuration where + def = defaultConfiguration -------------------------------------------------------------------------------- -- | Default configuration for a hakyll application |