aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/parser/MessageParser.java
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2015-12-10 20:37:34 +0100
committersteckbrief <steckbrief@chefmail.de>2015-12-10 20:37:34 +0100
commit3b1723dcf19dc6e3390df63a71df903d9cb7dd94 (patch)
treea912db2e2204645fc3138cce62bb75a8d1a9b7d3 /src/main/java/eu/siacs/conversations/parser/MessageParser.java
parentaa6a2e1c182858e7bcc077f5220546e08df12ec1 (diff)
parenta7454223008c78dcf5e0ff727bca64241f99daa1 (diff)
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/parser/MessageParser.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 7e7bb2fa..cb64630d 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -1,11 +1,11 @@
package eu.siacs.conversations.parser;
-import de.thedevstack.conversationsplus.utils.Logging;
import android.util.Pair;
import net.java.otr4j.session.Session;
import net.java.otr4j.session.SessionStatus;
+import de.thedevstack.android.logcat.Logging;
import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
import de.thedevstack.conversationsplus.utils.AvatarUtil;