diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2020-01-01 20:50:07 +0000 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2020-01-01 20:50:07 +0000 |
commit | 5a086f664e9efbb25acb0652dc0e10adede61c2e (patch) | |
tree | 405ba59aec2689cc0616a2afcc211e4aedf11c06 /Common.hs | |
parent | a332433aac213fdece32f9a9e5b5749853770abf (diff) | |
parent | a359c2841a68bb7fe6182fddc8e84abb7a463040 (diff) | |
download | git-repair-5a086f664e9efbb25acb0652dc0e10adede61c2e.tar.gz |
Merge remote-tracking branch 'dgit/dgit/sid'
Diffstat (limited to 'Common.hs')
-rw-r--r-- | Common.hs | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -13,7 +13,6 @@ import Data.String.Utils as X hiding (join) import Data.Monoid as X import System.FilePath as X -import System.Directory as X import System.IO as X hiding (FilePath) #ifndef mingw32_HOST_OS import System.Posix.IO as X hiding (createPipe) @@ -25,7 +24,7 @@ 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.Directory as X hiding (getFileSize) import Utility.Monad as X import Utility.Data as X import Utility.Applicative as X |