diff options
| author | CH Chethan Reddy <40890937+Chethan2k1@users.noreply.github.com> | 2020-08-09 08:35:15 +0530 |
|---|---|---|
| committer | CH Chethan Reddy <40890937+Chethan2k1@users.noreply.github.com> | 2020-08-09 08:35:15 +0530 |
| commit | 2e20049b3695d0aa7ca09db079bcc39c0485d098 (patch) | |
| tree | 664dfdabdd940f217fac4d55c55e9f47358036ee /resources/qml/Reactions.qml | |
| parent | Add Room Verification Messages (diff) | |
| download | nheko-2e20049b3695d0aa7ca09db079bcc39c0485d098.tar.xz | |
[WIP] Room-Verification Messages
Diffstat (limited to 'resources/qml/Reactions.qml')
| -rw-r--r-- | resources/qml/Reactions.qml | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/resources/qml/Reactions.qml b/resources/qml/Reactions.qml index 11109d7f..9fc30f61 100644 --- a/resources/qml/Reactions.qml +++ b/resources/qml/Reactions.qml @@ -35,13 +35,8 @@ Flow { ToolTip.text: modelData.users onClicked: { -<<<<<<< HEAD console.debug("Picked " + modelData.key + "in response to " + reactionFlow.eventId + " in room " + reactionFlow.roomId + ". selfReactedEvent: " + modelData.selfReactedEvent) - timelineManager.queueReactionMessage(reactionFlow.eventId, modelData.key) -======= - console.debug("Picked " + model.key + "in response to " + reactionFlow.eventId + " in room " + reactionFlow.roomId + ". selfReactedEvent: " + model.selfReactedEvent) - TimelineManager.reactToMessage(reactionFlow.roomId, reactionFlow.eventId, model.key, model.selfReactedEvent) ->>>>>>> Fix presence indicator + TimelineManager.queueReactionMessage(reactionFlow.eventId, modelData.key) } |