From a13ebd3fa82e2363055db2ea19f1101c07530f49 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 25 Aug 2014 21:20:27 +0300
Subject: [PATCH] Some merge resolution

---
 yesod-eventsource/yesod-eventsource.cabal | 2 +-
 yesod-form/Yesod/Form/Functions.hs        | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/yesod-eventsource/yesod-eventsource.cabal b/yesod-eventsource/yesod-eventsource.cabal
index 52471574..9ff36ad7 100644
--- 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
diff --git a/yesod-form/Yesod/Form/Functions.hs b/yesod-form/Yesod/Form/Functions.hs
index 10b827ae..5fd03e6a 100644
--- 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".