diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-04-28 13:18:44 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-04-28 13:18:44 -0400 |
| commit | 4e6ae471667beaa308607b3b03522ebabaf3014a (patch) | |
| tree | 8772da57337397c4a6d85232c3d5faa49a17fd32 /Annex | |
| parent | 20edc36c790793faf1a01494572d3200308bb114 (diff) | |
Fix build with directory-1.2.6.2.
It started exporting a isSymbolicLink which supports windows. But,
git-annex does no use symlinks on windows yet and this conflicts with the
function by the same name from unix-compat, so hide it.
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/Fixup.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Annex/Fixup.hs b/Annex/Fixup.hs index 1cde86390..35634f14c 100644 --- a/Annex/Fixup.hs +++ b/Annex/Fixup.hs @@ -20,7 +20,7 @@ import Utility.Exception import System.IO import System.FilePath -import System.Directory +import System.Directory hiding (isSymbolicLink) import Data.List import Control.Monad import Control.Monad.IfElse |