summaryrefslogtreecommitdiff
path: root/Annex/AutoMerge.hs
diff options
context:
space:
mode:
Diffstat (limited to 'Annex/AutoMerge.hs')
-rw-r--r--Annex/AutoMerge.hs2
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