fix merge conflict

This commit is contained in:
Christian Schneppe 2021-01-06 20:23:27 +01:00
parent 40077c96df
commit 56bd3cda59

View file

@ -379,9 +379,9 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
}
};
private final OnClickListener mBlockClickListener = this::showBlockSubmenu;
private final OnClickListener mAddBackClickListener = new OnClickListener() {
private OnClickListener mAddBackClickListener = new OnClickListener() {
@Override
public void onClick(View v) {
final Contact contact = conversation == null ? null : conversation.getContact();