diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-08-15 17:30:16 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-08-15 17:30:40 -0400 |
| commit | 022e81407e7d806100a0882c0f23067a88b4900a (patch) | |
| tree | b8035dc47239d6b687aa83adef0d45e11ac65969 /Build/EvilSplicer.hs | |
| parent | 52089bbe73d95c5a2c06a3c58c507129335e5580 (diff) | |
| parent | e9128138ef1e19a341d7edfda4db2d6b1f8f6b0a (diff) | |
Merge branch 'master' into s3-aws
Conflicts:
git-annex.cabal
Diffstat (limited to 'Build/EvilSplicer.hs')
| -rw-r--r-- | Build/EvilSplicer.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Build/EvilSplicer.hs b/Build/EvilSplicer.hs index 6b80929af..648d631b5 100644 --- a/Build/EvilSplicer.hs +++ b/Build/EvilSplicer.hs @@ -46,7 +46,7 @@ import Prelude hiding (log) import Utility.Monad import Utility.Misc -import Utility.Exception +import Utility.Exception hiding (try) import Utility.Path import Utility.FileSystemEncoding |