mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into concurrentprogress

Browse source 
Conflicts:
	Command/Fsck.hs
	Messages.hs
	Remote/Directory.hs
	Remote/Git.hs
	Remote/Helper/Special.hs
	Types/Remote.hs
	debian/changelog
	git-annex.cabal
This commit is contained in:
Joey Hess 2015-05-12 13:23:22 -04:00
commit e27b97d364
378 changed files with 4978 additions and 1158 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Annex/Drop.hs
View file

@ -9,7 +9,7 @@ module Annex.Drop where
import Common.Annex
import Logs.Trust
import Config.NumCopies
import Annex.NumCopies
import Types.Remote (uuid)
import Types.Key (key2file)
import qualified Remote