haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some merge resolution

Browse Source
This commit is contained in:
Michael Snoyman 2014-08-25 21:20:27 +03:00
parent c66ef04f17
commit a13ebd3fa8
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yesod-eventsource/yesod-eventsource.cabal
View File

@ -29,7 +29,7 @@ description:
library library
build-depends: base >= 4 && < 5 build-depends: base >= 4 && < 5
, yesod-core == 1.2.* , yesod-core == 1.2.*
, conduit >= 0.5 && < 1.2 , conduit >= 0.5 && < 1.3
, wai >= 1.3 , wai >= 1.3
, wai-eventsource >= 1.3 , wai-eventsource >= 1.3
, wai-extra , wai-extra

3
yesod-form/Yesod/Form/Functions.hs
View File

@ -410,9 +410,6 @@ $forall view <- views
|] |]
return (res, widget) return (res, widget)
renderBootstrap :: Monad m => FormRender m a
renderBootstrap = renderBootstrap2
-- | Render a form using Bootstrap v2-friendly shamlet syntax. -- | Render a form using Bootstrap v2-friendly shamlet syntax.
-- If you're using Bootstrap v3, then you should use the -- If you're using Bootstrap v3, then you should use the
-- functions from module "Yesod.Form.Bootstrap3". -- functions from module "Yesod.Form.Bootstrap3".