From 6d4ab4dc7389e2184d32962b751268125dfa56ae Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 29 Feb 2016 15:57:47 -0400 Subject: make assistant aware of adjusted branches when merging --- Assistant/XMPP/Git.hs | 1 - 1 file changed, 1 deletion(-) (limited to 'Assistant/XMPP') diff --git a/Assistant/XMPP/Git.hs b/Assistant/XMPP/Git.hs index 9e0b9278b..286fcf879 100644 --- a/Assistant/XMPP/Git.hs +++ b/Assistant/XMPP/Git.hs @@ -27,7 +27,6 @@ import Annex.TaggedPush import Annex.CatFile import Config import Git -import qualified Git.Branch import qualified Types.Remote as Remote import qualified Remote as Remote import Remote.List -- cgit v1.2.3