diff options
author | Mike Taylor <bear42@gmail.com> | 2015-04-11 20:12:19 -0400 |
---|---|---|
committer | Mike Taylor <bear42@gmail.com> | 2015-04-11 20:12:19 -0400 |
commit | 86e85f98357b40941fddb7a2dbf8fbe16f96032e (patch) | |
tree | 65a86c0378c5e59f1822dfba8ed484f77ff5ebeb /sleekxmpp/plugins/google/settings/settings.py | |
parent | cc145d20b077442b7d4118d4d2f4c27e1b0faf0c (diff) | |
parent | 073e85381a86069e931369bb5353cab2a2e3682d (diff) | |
download | slixmpp-86e85f98357b40941fddb7a2dbf8fbe16f96032e.tar.gz slixmpp-86e85f98357b40941fddb7a2dbf8fbe16f96032e.tar.bz2 slixmpp-86e85f98357b40941fddb7a2dbf8fbe16f96032e.tar.xz slixmpp-86e85f98357b40941fddb7a2dbf8fbe16f96032e.zip |
Merge pull request #313 from mayflower/develop
Proposing #310 again in fixed version
Diffstat (limited to 'sleekxmpp/plugins/google/settings/settings.py')
-rw-r--r-- | sleekxmpp/plugins/google/settings/settings.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sleekxmpp/plugins/google/settings/settings.py b/sleekxmpp/plugins/google/settings/settings.py index 7122ff56..591956fc 100644 --- a/sleekxmpp/plugins/google/settings/settings.py +++ b/sleekxmpp/plugins/google/settings/settings.py @@ -6,8 +6,6 @@ See the file LICENSE for copying permission. """ -import logging - from sleekxmpp.stanza import Iq from sleekxmpp.xmlstream.handler import Callback from sleekxmpp.xmlstream.matcher import StanzaPath |