From 11583d8ed40c7b469dec5617858391d2ffe0e726 Mon Sep 17 00:00:00 2001 From: aaron levin Date: Mon, 11 May 2015 16:57:57 -0400 Subject: [PATCH] Add base64-bytestring dependency for basic auth --- servant-server/servant-server.cabal | 2 ++ 1 file changed, 2 insertions(+) diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal index 7e36387e..4e023bbb 100644 --- a/servant-server/servant-server.cabal +++ b/servant-server/servant-server.cabal @@ -42,9 +42,11 @@ library Servant.Server.Internal.ServantErr Servant.Utils.StaticFiles build-depends: +<<<<<<< HEAD base >= 4.7 && < 5 , aeson >= 0.7 && < 0.11 , attoparsec >= 0.12 && < 0.14 + , base64-bytestring >= 1.0.0.0 , bytestring >= 0.10 && < 0.11 , containers >= 0.5 && < 0.6 , http-api-data >= 0.1 && < 0.3