1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-10 09:22:25 +03:00

Fix merge conflicts

This commit is contained in:
Dariusz Niemczyk
2021-08-06 16:29:23 +02:00
parent 4328083ea7
commit cba87f433b
3 changed files with 28 additions and 7 deletions

View File

@@ -55,7 +55,7 @@ interface IProps {
// a callback which is called when the content in the CallView changes
// in a way that is likely to cause a resize.
onResize?: any;
onResize?: () => void;
// Whether this call view is for picture-in-picture mode
// otherwise, it's the larger call view when viewing the room the call is in.