on develop help sign in
Merge pull request #104 from Arguggi/develop

Import correct aeson module

commited3b790f81f8396324fc9a3495de9c911119facc authorRyan Trinkle <ryan.trinkle@gmail.com> dateMon 10 Oct 2016, 08:14 (10 years ago) parent767c9b7d41c20b
1 file changed+5
src/Reflex/Dom/Xhr.hs+5
src/Reflex/Dom/Xhr.hs+5
@@ -1,3 +1,4 @@
1+{-# LANGUAGE CPP #-}
12{-# LANGUAGE DeriveDataTypeable #-}
23{-# LANGUAGE DeriveFunctor #-}
34{-# LANGUAGE FlexibleContexts #-}
@@ -71,7 +72,11 @@ import Control.Lens
7172import Control.Monad hiding (forM)
7273import Control.Monad.IO.Class
7374import Data.Aeson
75+#if MIN_VERSION_aeson(1,0,0)
76+import Data.Aeson.Text
77+#else
7478import Data.Aeson.Encode
79+#endif
7580import qualified Data.ByteString.Lazy as BL
7681import Data.Default
7782import Data.Map (Map)