mirror of
https://codeberg.org/monocles/monocles_chat.git
synced 2025-01-30 16:51:42 +01:00
fix merge conflict
This commit is contained in:
parent
40077c96df
commit
56bd3cda59
1 changed files with 1 additions and 1 deletions
|
@ -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();
|
||||
|
|
Loading…
Add table
Reference in a new issue