Commit b232e0f9 authored by Matthieu Tanon's avatar Matthieu Tanon
Browse files

Fix merge typo

parent 8b027663
......@@ -98,11 +98,11 @@ public:
using ParticipantStateRetrievalFunc = std::function<std::list<ParticipantState>(const std::shared_ptr<EventLog> &eventLog)>;
int getChatMessageCount (const ConferenceId &ConferenceId = ConferenceId()) const;
int getUnreadChatMessageCount (const ConferenceId &ConferenceId = ConferenceId()) const;
int getChatMessageCount (const ConferenceId &conferenceId = ConferenceId()) const;
int getUnreadChatMessageCount (const ConferenceId &conferenceId = ConferenceId()) const;
void markChatMessagesAsRead (const ConferenceId &ConferenceId) const;
std::list<std::shared_ptr<ChatMessage>> getUnreadChatMessages (const ConferenceId &ConferenceId) const;
void markChatMessagesAsRead (const ConferenceId &conferenceId) const;
std::list<std::shared_ptr<ChatMessage>> getUnreadChatMessages (const ConferenceId &conferenceId) const;
std::list<ParticipantState> getChatMessageParticipantsByImdnState (
const std::shared_ptr<EventLog> &eventLog,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment