aboutsummaryrefslogtreecommitdiff
path: root/Common.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-04-22 20:24:53 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-04-22 20:24:53 -0400
commit4d376b47b7aa506c4f4a4c5ccc83ca2ef1aeacc2 (patch)
tree33ab2e7c4b72d8a7fce40a0e93f63f3d50a6c3ab /Common.hs
parentf672c39279366a8927abfcde3050952365f5e0ee (diff)
expose Control.Monad.join
I think I've been looking for that function for some time. Ie, I remember wanting to collapse Just Nothing to Nothing.
Diffstat (limited to 'Common.hs')
-rw-r--r--Common.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Common.hs b/Common.hs
index 3513425c0..5c355a6ed 100644
--- a/Common.hs
+++ b/Common.hs
@@ -2,7 +2,7 @@
module Common (module X) where
-import Control.Monad as X hiding (join)
+import Control.Monad as X
import Control.Monad.IfElse as X
import Control.Applicative as X
import "mtl" Control.Monad.State.Strict as X (liftIO)
@@ -10,7 +10,7 @@ import Control.Exception.Extensible as X (IOException)
import Data.Maybe as X
import Data.List as X hiding (head, tail, init, last)
-import Data.String.Utils as X
+import Data.String.Utils as X hiding (join)
import "MissingH" System.Path as X
import System.FilePath as X