on develop help sign in
A couple more fixes for travis
8182a75Ryan Trinkle
src/Reflex/Class.hs+1−1
@@ -36,7 +36,7 @@ import Data.GADT.Show (GShow (..))
36import Data.List.NonEmpty (NonEmpty (..))
36import Data.List.NonEmpty (NonEmpty (..))
37import Data.Map (Map)
37import Data.Map (Map)
38import Data.Maybe
38import Data.Maybe
39−import Data.Monoid
39+import Data.Monoid hiding ((<>))
40import Data.Semigroup (Semigroup, sconcat, stimes, stimesIdempotentMonoid, (<>))
40import Data.Semigroup (Semigroup, sconcat, stimes, stimesIdempotentMonoid, (<>))
41import Data.These
41import Data.These
42import Data.Traversable
42import Data.Traversable
test/Reflex/Bench/Focused.hs+1−1
@@ -18,7 +18,7 @@ import Control.Applicative
18import Control.Monad
18import Control.Monad
19import Control.Monad.Fix
19import Control.Monad.Fix
20import Control.Monad.Identity
20import Control.Monad.Identity
21−import Data.Traversable (for, Traverse)
21+import Data.Traversable (for, traverse)
22
22
23import qualified Data.Dependent.Map as DMap
23import qualified Data.Dependent.Map as DMap
24import Data.Map (Map)
24import Data.Map (Map)