diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-11-14 17:04:58 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-11-14 17:04:58 -0400 |
| commit | 521ef9dfebd6a9418a5dce7d1686dbf353ddd0a0 (patch) | |
| tree | afe6bb5d52e21a049f04020ae448afb81adc02a7 /Annex/FileMatcher.hs | |
| parent | f4b4f327b69189d24663a7db6407c1f7a6e48fdd (diff) | |
| parent | 5c6f6e4d0abb9b4856908a500611044b3b7a48e6 (diff) | |
Merge branch 'master' into tasty-tests
Conflicts:
Test.hs
Diffstat (limited to 'Annex/FileMatcher.hs')
| -rw-r--r-- | Annex/FileMatcher.hs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Annex/FileMatcher.hs b/Annex/FileMatcher.hs index 3abba1055..cded857a2 100644 --- a/Annex/FileMatcher.hs +++ b/Annex/FileMatcher.hs @@ -13,6 +13,7 @@ import Common.Annex import Limit import Utility.Matcher import Types.Group +import Types.Limit import Logs.Group import Logs.Remote import Annex.UUID |