BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

I missed a line when resolving the conflict

Browse Source
This commit is contained in:
Anton Georgiev 2017-11-14 12:16:29 -05:00 committed by GitHub
parent 2276522c2e
commit 16e7f5867b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/chat/ClearPublicChatHistoryPubMsgHdlr.scala
View File

@ -27,6 +27,7 @@ trait ClearPublicChatHistoryPubMsgHdlr extends LogHelper with SystemConfiguratio
val meetingId = liveMeeting.props.meetingProp.intId
val reason = "No permission to clear chat in meeting."
PermissionCheck.ejectUserForFailedPermission(meetingId, msg.header.userId, reason, bus.outGW, liveMeeting)
state
} else {
ChatModel.clearPublicChatHistory(liveMeeting.chatModel)
val newState = for {