summaryrefslogtreecommitdiff
path: root/Assistant/Threads/Merger.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-03-10 22:24:13 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-03-10 22:24:13 -0400
commitaecc1edcdd80c41f04e30c3e4749b3b301cd928d (patch)
tree6f00c02bf3414660b1aa53ebe476616b9b631e44 /Assistant/Threads/Merger.hs
parentfd403af92c538dc4da22accc1c7c02a588dde6ef (diff)
let's put type modules under the parent module, not in a Types directory
Diffstat (limited to 'Assistant/Threads/Merger.hs')
-rw-r--r--Assistant/Threads/Merger.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Assistant/Threads/Merger.hs b/Assistant/Threads/Merger.hs
index 4a482583f..a1b1693cf 100644
--- a/Assistant/Threads/Merger.hs
+++ b/Assistant/Threads/Merger.hs
@@ -13,7 +13,7 @@ import Assistant.BranchChange
import Assistant.DaemonStatus
import Assistant.ScanRemotes
import Utility.DirWatcher
-import Utility.Types.DirWatcher
+import Utility.DirWatcher.Types
import qualified Annex.Branch
import qualified Git
import qualified Git.Branch