From 53aee0e2361f5d847f4a1cc3429429b1f01f61f0 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 12 Sep 2014 18:39:15 -0700 Subject: [PATCH] resolve conflict --- hledger-web/hledger-web.cabal | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal index 7a0b1f1a9..1112370d9 100644 --- a/hledger-web/hledger-web.cabal +++ b/hledger-web/hledger-web.cabal @@ -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