diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-01-20 16:36:33 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-01-20 16:36:33 -0400 |
| commit | 10c579282b4f0acc7f26d8084916f7d538a89bd8 (patch) | |
| tree | bc9e4a526b3bef0cb54b784cbe0d42a555a329db /Annex/AutoMerge.hs | |
| parent | d115fb8d3418d494708390f8a74938d830c669b7 (diff) | |
remove 163 lines of code without changing anything except imports
Diffstat (limited to 'Annex/AutoMerge.hs')
| -rw-r--r-- | Annex/AutoMerge.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Annex/AutoMerge.hs b/Annex/AutoMerge.hs index 938407890..c9f13f5bf 100644 --- a/Annex/AutoMerge.hs +++ b/Annex/AutoMerge.hs @@ -11,7 +11,7 @@ module Annex.AutoMerge , commitResolvedMerge ) where -import Common.Annex +import Annex.Common import qualified Annex.Queue import Annex.Direct import Annex.CatFile |