Permalink
Browse files

Merge branch 'master' into monadheist

  • Loading branch information...
2 parents dafe85d + 4ec0dff commit 60af8d627001e742954c7943f448e75e16c951d9 @mightybyte mightybyte committed Mar 13, 2012
Showing with 3 additions and 1 deletion.
  1. +1 −0 .ghci
  2. +1 −1 heist.cabal
  3. +1 −0 src/Text/Templating/Heist.hs
View
1 .ghci
@@ -2,3 +2,4 @@
:set -Wall
:set -isrc
:set -itest/suite
+:set -hide-package MonadCatchIO-mtl
View
@@ -102,7 +102,7 @@ Library
time >= 1.1 && < 1.5,
transformers,
xmlhtml >= 0.1.6 && < 0.2,
- unordered-containers >= 0.1.4 && < 0.2,
+ unordered-containers >= 0.1.4 && < 0.3,
vector >= 0.9 && < 0.10
if impl(ghc >= 6.12.0)
@@ -74,6 +74,7 @@ module Text.Templating.Heist
, Splice
, HeistT
, HeistState
+ , evalHeistT
, templateNames
, spliceNames

0 comments on commit 60af8d6

Please sign in to comment.