aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-11-11 17:45:16 +0100
committeriNPUTmice <daniel@gultsch.de>2014-11-11 17:45:16 +0100
commit52ca2e7391acd6e34eb1dfc4c6f893bc154dec37 (patch)
tree6085b390ee7f408f289c66c19eb541e478ea4d8f /src/main/java
parentd1bf9a3f6d63deaef28a1966e90c6ccd18275d30 (diff)
parent8cb97f517fcd9bdb33f07edccf27b7497653c2de (diff)
Merge branch 'feature/otr_verification' of https://github.com/siacs/Conversations into feature/otr_verification
Conflicts: src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java b/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
index 3c75b501..2a425d12 100644
--- a/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
@@ -272,7 +272,6 @@ public class VerifyOTRActivity extends XmppActivity implements XmppConnectionSer
}
}
- @Override
public void onConversationUpdate() {
runOnUiThread(new Runnable() {
@Override