aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/parser/MessageParser.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-09-07 14:50:09 +0200
committerDaniel Gultsch <daniel@gultsch.de>2014-09-07 14:50:09 +0200
commit04665b59c8b96341ac050399aaf0654e2e4e3132 (patch)
tree5a09a1dc8093355fde000286f6c20ebeae713dd1 /src/eu/siacs/conversations/parser/MessageParser.java
parentd9990e6cd8bb4f2d9bc5696019f757db8a732b1f (diff)
parentecd613dcdd4288b52fea893192c75f3e527436ea (diff)
Merge pull request #424 from betheg/bookmark_password
MUC: set the password from bookmarks.
Diffstat (limited to 'src/eu/siacs/conversations/parser/MessageParser.java')
-rw-r--r--src/eu/siacs/conversations/parser/MessageParser.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/parser/MessageParser.java b/src/eu/siacs/conversations/parser/MessageParser.java
index ca029e9d..fa5e0a59 100644
--- a/src/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/eu/siacs/conversations/parser/MessageParser.java
@@ -1,7 +1,6 @@
package eu.siacs.conversations.parser;
import android.os.SystemClock;
-import android.util.Log;
import net.java.otr4j.session.Session;
import net.java.otr4j.session.SessionStatus;
import eu.siacs.conversations.Config;