summaryrefslogtreecommitdiff
path: root/Assistant/Threads
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-03-16 00:12:28 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-03-16 00:19:56 -0400
commit2274b305d41b1feb840fe9dd5dabd3b2f705a5ee (patch)
tree31e74939426ddce12a309d2418b9995adb4f807e /Assistant/Threads
parent242c2e577b8545c2e9ed117ce7196afcf361ed57 (diff)
make liftAnnex and liftAssistant polymorphic, like liftIO
Diffstat (limited to 'Assistant/Threads')
-rw-r--r--Assistant/Threads/XMPPClient.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Assistant/Threads/XMPPClient.hs b/Assistant/Threads/XMPPClient.hs
index 69a886c4a..66c6e7227 100644
--- a/Assistant/Threads/XMPPClient.hs
+++ b/Assistant/Threads/XMPPClient.hs
@@ -19,7 +19,7 @@ import Assistant.DaemonStatus
import qualified Remote
import Utility.ThreadScheduler
import Assistant.WebApp (UrlRenderer, renderUrl)
-import Assistant.WebApp.Types
+import Assistant.WebApp.Types hiding (liftAssistant)
import Assistant.Alert
import Assistant.Pairing
import Assistant.XMPP.Git