From 122b09e2f24cff55c65b84cbccd78ed640a234be Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Sat, 24 Dec 2016 14:53:58 -0400
Subject: Merge from git-annex.

---
 Common.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Common.hs')

diff --git a/Common.hs b/Common.hs
index 7710306..9dab5dd 100644
--- a/Common.hs
+++ b/Common.hs
@@ -5,12 +5,13 @@ module Common (module X) where
 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)
+import Control.Monad.IO.Class as X (liftIO)
 
 import Data.Maybe as X
 import Data.List as X hiding (head, tail, init, last)
 import Data.String.Utils as X hiding (join)
 import Data.Monoid as X
+import Data.Default as X
 
 import System.FilePath as X
 import System.IO as X hiding (FilePath)
@@ -24,12 +25,11 @@ import Utility.Exception as X
 import Utility.SafeCommand as X
 import Utility.Process as X
 import Utility.Path as X
+import Utility.Directory as X
 import Utility.Monad as X
 import Utility.Data as X
 import Utility.Applicative as X
-import Utility.FileSystemEncoding as X
 import Utility.PosixFiles as X hiding (fileSize)
 import Utility.FileSize as X
-import Utility.Directory as X
 
 import Utility.PartialPrelude as X
-- 
cgit v1.2.3