Merge tag '1.20151215' into debian

tagging package git-repair version 1.20151215

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