summaryrefslogtreecommitdiff
path: root/Assistant
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-08-26 14:14:12 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-08-26 14:14:12 -0400
commit20a451a58bf6be3359d458cebb9e9e192313e11a (patch)
tree7d3096e4fa802bbbe6958d626bf6f1d9c0069ed4 /Assistant
parentae52efc673ee79119baacf401c54d38290d1369b (diff)
cleanup
Diffstat (limited to 'Assistant')
-rw-r--r--Assistant/Threads/Merger.hs6
1 files changed, 1 insertions, 5 deletions
diff --git a/Assistant/Threads/Merger.hs b/Assistant/Threads/Merger.hs
index 6c33f4f20..0f33b68ed 100644
--- a/Assistant/Threads/Merger.hs
+++ b/Assistant/Threads/Merger.hs
@@ -5,14 +5,10 @@
- Licensed under the GNU GPL version 3 or higher.
-}
-module Assistant.Threads.Merger (
- mergeThread,
- manualPull,
-) where
+module Assistant.Threads.Merger where
import Assistant.Common
import Assistant.ThreadedMonad
-import Assistant.Sync
import Utility.DirWatcher
import Utility.Types.DirWatcher
import qualified Git