diff options
author | Sangeeth Saravanaraj <sangeeth@riptideio.com> | 2015-04-28 16:53:40 +0530 |
---|---|---|
committer | Sangeeth Saravanaraj <sangeeth@riptideio.com> | 2015-04-28 16:53:40 +0530 |
commit | 80b60fc0483b21c8d5829b61cabbf9b46aa2c2fb (patch) | |
tree | ecb5905d19a563b4e6fe864afd0122321bf7cea1 /sleekxmpp/plugins/google/settings | |
parent | 904480712157d762d35de16ce55202d641a56b3c (diff) | |
parent | 842157a6cc25d9e85e6e31b3cf3349ba83ece101 (diff) | |
download | slixmpp-80b60fc0483b21c8d5829b61cabbf9b46aa2c2fb.tar.gz slixmpp-80b60fc0483b21c8d5829b61cabbf9b46aa2c2fb.tar.bz2 slixmpp-80b60fc0483b21c8d5829b61cabbf9b46aa2c2fb.tar.xz slixmpp-80b60fc0483b21c8d5829b61cabbf9b46aa2c2fb.zip |
Merge remote-tracking branch 'origin/develop' into xep_0332
Diffstat (limited to 'sleekxmpp/plugins/google/settings')
-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 |