summaryrefslogtreecommitdiff
path: root/Annex/Content
diff options
context:
space:
mode:
authorGravatar Joey Hess <id@joeyh.name>2013-05-13 20:11:30 -0500
committerGravatar Joey Hess <id@joeyh.name>2013-05-13 20:11:30 -0500
commit174da3515594fea9ebc1b346d8a52bfd16a443bf (patch)
tree8bcd7d29a90fa2925a4916ef6f1ab0ef8e6e193a /Annex/Content
parent13c19fb0a0d1df6bfdd9ba2bca3eb45d624015d5 (diff)
parent1dd4574909b40ffdb77ae1338b353156d73983af (diff)
Merge branch 'windows' of git://git-annex.branchable.com into windows
Diffstat (limited to 'Annex/Content')
-rwxr-xr-xAnnex/Content/Direct.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Annex/Content/Direct.hs b/Annex/Content/Direct.hs
index 025ff60bf..b885b5e5b 100755
--- a/Annex/Content/Direct.hs
+++ b/Annex/Content/Direct.hs
@@ -29,7 +29,7 @@ import Common.Annex
import qualified Annex
import Annex.Perms
import qualified Git
-import Utility.TempFile
+import Utility.Tmp
import Logs.Location
import Utility.InodeCache