From 2e20049b3695d0aa7ca09db079bcc39c0485d098 Mon Sep 17 00:00:00 2001 From: CH Chethan Reddy <40890937+Chethan2k1@users.noreply.github.com> Date: Sun, 9 Aug 2020 08:35:15 +0530 Subject: [WIP] Room-Verification Messages --- resources/qml/Reactions.qml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'resources/qml/Reactions.qml') 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) } -- cgit 1.5.1