From cfc51c5e4ec04f9d5088c42922217cf90b63c903 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 9 Oct 2014 15:19:24 -0400 Subject: avoid using Assistant.WebApp.Bootstrap3 when building with current yesod Only use that when building with ancient yesod, which does not include it. This also let me remove ifdefs in the file to support building with the new version of yesod. --- Utility/Yesod.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Utility/Yesod.hs b/Utility/Yesod.hs index 6d38ba4ed..9fba28732 100644 --- a/Utility/Yesod.hs +++ b/Utility/Yesod.hs @@ -25,10 +25,11 @@ module Utility.Yesod #if MIN_VERSION_yesod(1,2,0) import Yesod as Y +import Yesod.Form.Bootstrap3 as Y hiding (bfs) #else import Yesod as Y hiding (Html) -#endif import Assistant.WebApp.Bootstrap3 as Y hiding (bfs) +#endif #ifndef __NO_TH__ import Yesod.Default.Util import Language.Haskell.TH.Syntax (Q, Exp) -- cgit v1.2.3