Some merge resolution

2014-08-25 21:20:27 +03:00 · 2014-08-25 21:20:27 +03:00 · a13ebd3fa8
commit a13ebd3fa8
parent c66ef04f17
2 changed files with 1 additions and 4 deletions
--- a/yesod-eventsource/yesod-eventsource.cabal
+++ b/yesod-eventsource/yesod-eventsource.cabal
@ -29,7 +29,7 @@ description:
 library
    build-depends:   base                  >= 4        && < 5
                   , yesod-core            == 1.2.*
-                   , conduit               >= 0.5      && < 1.2
+                   , conduit               >= 0.5      && < 1.3
                   , wai                   >= 1.3
                   , wai-eventsource       >= 1.3
                   , wai-extra
--- a/yesod-form/Yesod/Form/Functions.hs
+++ b/yesod-form/Yesod/Form/Functions.hs
@ -410,9 +410,6 @@ $forall view <- views
 |]
    return (res, widget)

-renderBootstrap :: Monad m => FormRender m a
-renderBootstrap = renderBootstrap2
-
 -- | Render a form using Bootstrap v2-friendly shamlet syntax.
 -- If you're using Bootstrap v3, then you should use the
 -- functions from module "Yesod.Form.Bootstrap3".