Fix merge conflicts
This commit is contained in:
parent
4328083ea7
commit
cba87f433b
3 changed files with 28 additions and 7 deletions
|
@ -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.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue