Fix import conflicts for servant 0.13.

brendanhay · Mar 13, 2018 · e31ece9 · e31ece9
1 parent 896ef34
commit e31ece9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/src/Network/Google/Prelude.hs b/core/src/Network/Google/Prelude.hs
@@ -27,7 +27,7 @@ import GHC.Generics        as Export (Generic)
 import Network.HTTP.Client as Export (RequestBody)
 import Numeric.Natural     as Export (Natural)
 import Prelude             as Export hiding (product)
-import Servant.API         as Export hiding (Headers, Link, getResponse)
+import Servant.API         as Export hiding (Headers, Link, getResponse, Stream)
 import Servant.Utils.Links as Export hiding (Link)
 import Web.HttpApiData     as Export (FromHttpApiData (..), ToHttpApiData (..))
 

diff --git a/core/src/Network/Google/Types.hs b/core/src/Network/Google/Types.hs
@@ -53,7 +53,7 @@ import           Network.HTTP.Client          (HttpException, RequestBody (..))
 import           Network.HTTP.Media           hiding (Accept)
 import           Network.HTTP.Types           hiding (Header)
 import qualified Network.HTTP.Types           as HTTP
-import           Servant.API
+import           Servant.API                  hiding (Stream)
 import           Web.HttpApiData
 
 data AltJSON   = AltJSON   deriving (Eq, Ord, Show, Read, Generic, Typeable)