mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-24 13:25:52 +03:00
Merge pull request #5766 from nextcloud/bugfix/conflict-resolution-button-in-activity-not-working
Bugfix. Conflict resolution button not clickable.
This commit is contained in:
commit
d63eb6a211
1 changed files with 1 additions and 1 deletions
|
@ -270,7 +270,7 @@ RowLayout {
|
|||
|
||||
maxActionButtons: activityModel.maxActionButtons
|
||||
|
||||
onTriggerAction: activityModel.slotTriggerAction(model.activityIndex, actionIndex)
|
||||
onTriggerAction: activityModel.slotTriggerAction(activityData.activityIndex, actionIndex)
|
||||
|
||||
onShowReplyField: isTalkReplyOptionVisible = true
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue