Merge branch 'feature/otr_verification' of https://github.com/siacs/Conversations into feature/otr_verification

iNPUTmice created 11 years ago

Conflicts:
	src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java

Change summary

src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java | 1 -
1 file changed, 1 deletion(-)

Detailed changes

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