diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-05-12 13:23:22 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-05-12 13:23:22 -0400 |
| commit | 4d49342612dd441cdc503b5294035fc05a9a5a77 (patch) | |
| tree | 435a82d44b5a6aa3df411b36fb9fad2553cc670a /Types/Difference.hs | |
| parent | 44a48a19ffeb8085e7ae1f6bf58d5661adaf8a8d (diff) | |
| parent | 5cd9e10cde3c06ecc6a97f5f60a9def22f959bd2 (diff) | |
Merge branch 'master' into concurrentprogress
Conflicts:
Command/Fsck.hs
Messages.hs
Remote/Directory.hs
Remote/Git.hs
Remote/Helper/Special.hs
Types/Remote.hs
debian/changelog
git-annex.cabal
Diffstat (limited to 'Types/Difference.hs')
| -rw-r--r-- | Types/Difference.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Types/Difference.hs b/Types/Difference.hs index 064703bf7..1bab3fe36 100644 --- a/Types/Difference.hs +++ b/Types/Difference.hs @@ -20,9 +20,10 @@ import Utility.PartialPrelude import qualified Git import qualified Git.Config +import qualified Data.Set as S import Data.Maybe import Data.Monoid -import qualified Data.Set as S +import Prelude -- Describes differences from the v5 repository format. -- |