slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve conflict

Browse Source
This commit is contained in:
Simon Michael 2014-09-12 18:39:15 -07:00
parent d7f1733243
commit 53aee0e236
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hledger-web/hledger-web.cabal
View File

@ -158,8 +158,8 @@ library
, transformers , transformers
, wai , wai
, wai-extra , wai-extra
, wai-handler-launch >= 1.3 && < 3.1 , wai-handler-launch >= 1.3
, warp >= 1.3 && < 3.1 , warp >= 1.3
, yaml , yaml
, yesod >= 1.2 && < 1.3 , yesod >= 1.2 && < 1.3
, yesod-core , yesod-core
@ -255,8 +255,8 @@ executable hledger-web
, transformers , transformers
, wai , wai
, wai-extra , wai-extra
, wai-handler-launch >= 1.3 && < 3.1 , wai-handler-launch >= 1.3
, warp >= 1.3 && < 3.1 , warp >= 1.3
, yaml , yaml
, yesod >= 1.2 && < 1.3 , yesod >= 1.2 && < 1.3
, yesod-core , yesod-core