diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-02-29 15:57:47 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-02-29 15:57:47 -0400 |
| commit | 6d4ab4dc7389e2184d32962b751268125dfa56ae (patch) | |
| tree | 9d3f29e122aa92e82d499580b4ffb84be8619eba /Assistant/XMPP | |
| parent | 453ba048af869ed731e54f39b8b9db7d6859510a (diff) | |
make assistant aware of adjusted branches when merging
Diffstat (limited to 'Assistant/XMPP')
| -rw-r--r-- | Assistant/XMPP/Git.hs | 1 |
1 files changed, 0 insertions, 1 deletions
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 |