mirror of
https://github.com/simonmichael/hledger.git
synced 2024-09-19 18:29:36 +03:00
resolve conflict
This commit is contained in:
parent
d7f1733243
commit
53aee0e236
@ -158,8 +158,8 @@ library
|
||||
, transformers
|
||||
, wai
|
||||
, wai-extra
|
||||
, wai-handler-launch >= 1.3 && < 3.1
|
||||
, warp >= 1.3 && < 3.1
|
||||
, wai-handler-launch >= 1.3
|
||||
, warp >= 1.3
|
||||
, yaml
|
||||
, yesod >= 1.2 && < 1.3
|
||||
, yesod-core
|
||||
@ -255,8 +255,8 @@ executable hledger-web
|
||||
, transformers
|
||||
, wai
|
||||
, wai-extra
|
||||
, wai-handler-launch >= 1.3 && < 3.1
|
||||
, warp >= 1.3 && < 3.1
|
||||
, wai-handler-launch >= 1.3
|
||||
, warp >= 1.3
|
||||
, yaml
|
||||
, yesod >= 1.2 && < 1.3
|
||||
, yesod-core
|
||||
|
Loading…
Reference in New Issue
Block a user