Merge remote-tracking branch 'begriffs/v3' into v3

2015-10-24 21:25:01 +03:00
parent e40dcb1324 a624eb08ce
commit cd3a149aa4
5 changed files with 35 additions and 25 deletions
@@ -4,13 +4,9 @@ module PostgREST.Parsers
 where

 import           Control.Applicative hiding ((<$>))
--lines needed for ghc 7.8
-- import           Data.Functor ((<$>))
-- import           Data.Traversable (traverse)
-
--import           Control.Monad                 (join)
--import           Data.List                     (delete, find)
--import           Data.Maybe
+import           Control.Monad                 (join)
+import           Data.List                     (delete, find)
+import           Data.Maybe
 import           Data.Monoid
 import           Data.String.Conversions       (cs)
 import           Data.Text                     (Text)