e31ece9 · gogol · git.iko.soy

Fix import conflicts for servant 0.13.

commite31ece9b325f14cfae54523ad6c15c84b06d3715 authorJulian K. Arni <jkarni@gmail.com> dateMon 26 Feb 2018, 09:40 (9 years ago) parent896ef34

2 files changed+2−2

unifiedsplit

core/src/Network/Google/Prelude.hs+1−1

@@ -27,7 +27,7 @@ import GHC.Generics as Export (Generic)

2727import Network.HTTP.Client as Export (RequestBody)

2828import Numeric.Natural as Export (Natural)

2929import Prelude as Export hiding (product)

30−import Servant.API as Export hiding (Headers, Link, getResponse)

30+import Servant.API as Export hiding (Headers, Link, getResponse, Stream)

3131import Servant.Utils.Links as Export hiding (Link)

3232import Web.HttpApiData as Export (FromHttpApiData (..), ToHttpApiData (..))

3333

core/src/Network/Google/Types.hs+1−1

@@ -53,7 +53,7 @@ import Network.HTTP.Client (HttpException, RequestBody (..))

5353import Network.HTTP.Media hiding (Accept)

5454import Network.HTTP.Types hiding (Header)

5555import qualified Network.HTTP.Types as HTTP

56−import Servant.API

56+import Servant.API hiding (Stream)

5757import Web.HttpApiData

5858

5959data AltJSON = AltJSON deriving (Eq, Ord, Show, Read, Generic, Typeable)