Fix merge conflicts

This commit is contained in:
Dariusz Niemczyk 2021-08-06 16:29:23 +02:00
parent 4328083ea7
commit cba87f433b
No known key found for this signature in database
GPG key ID: 28DFE7164F497CB6
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.