summaryrefslogtreecommitdiff
path: root/Common.hs
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2015-12-15 20:46:53 -0400
committerJoey Hess <joeyh@joeyh.name>2015-12-15 20:46:53 -0400
commitef3214bd2856e5927eda83eeab969e421ee923ea (patch)
tree2babba7b0df56d627a80eb47b14f350829020518 /Common.hs
parentfcd731c545de94b277eb2a85ce20317e37ec9030 (diff)
downloadgit-repair-ef3214bd2856e5927eda83eeab969e421ee923ea.tar.gz
merge from git-annex
Diffstat (limited to 'Common.hs')
-rw-r--r--Common.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/Common.hs b/Common.hs
index 48aa32c..a6c5d54 100644
--- a/Common.hs
+++ b/Common.hs
@@ -30,6 +30,7 @@ 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
+import Utility.PosixFiles as X hiding (fileSize)
+import Utility.FileSize as X
import Utility.PartialPrelude as X