Merge branch 'master' of https://github.com/agentm/project-m36
Conflicts:
src/lib/ProjectM36/Client/Simple.hs
commitdf3e55ce7c08cf3e0d2f520b1ba91f009edc5737
authorAgentM <agentm@themactionfaction.com>
dateFri 22 Sep 2017, 19:00 (9 years ago)
parent4b687ea6fe4bfa
src/lib/ProjectM36/Client/Simple.hs−1
@@ -29,7 +29,6 @@ module ProjectM36.Client.Simple (
2929 C.RelationalExprBase(..)
3030 ) where
3131
32−
3332import Control.Exception.Base
3433import Control.Monad ((<=<))
3534import Control.Monad.Reader