summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Assistant/Sync.hs2
-rw-r--r--git-annex.cabal2
2 files changed, 2 insertions, 2 deletions
diff --git a/Assistant/Sync.hs b/Assistant/Sync.hs
index 3feed290e..702f1e98f 100644
--- a/Assistant/Sync.hs
+++ b/Assistant/Sync.hs
@@ -18,8 +18,6 @@ import qualified Command.Sync
import Utility.Parallel
import qualified Git
import qualified Git.Command
-import qualified Git.Merge
-import qualified Git.Ref
import qualified Remote
import qualified Types.Remote as Remote
import qualified Remote.List as Remote
diff --git a/git-annex.cabal b/git-annex.cabal
index 3b485aaed..f6a4e1660 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -197,6 +197,7 @@ Extra-Source-Files:
templates/configurators/enablewebdav.hamlet
templates/configurators/pairing/local/inprogress.hamlet
templates/configurators/pairing/local/prompt.hamlet
+ templates/configurators/pairing/tor/prompt.hamlet
templates/configurators/pairing/disabled.hamlet
templates/configurators/addglacier.hamlet
templates/configurators/fsck.cassius
@@ -219,6 +220,7 @@ Extra-Source-Files:
templates/configurators/addrepository/archive.hamlet
templates/configurators/addrepository/cloud.hamlet
templates/configurators/addrepository/connection.hamlet
+ templates/configurators/addrepository/torconnection.hamlet
templates/configurators/addrepository/ssh.hamlet
templates/configurators/addrepository/misc.hamlet
templates/configurators/rsync.net/add.hamlet