Fix merge conflicts

2021-08-06 16:29:23 +02:00 · 2021-08-06 16:29:23 +02:00 · cba87f433b
commit cba87f433b
parent 4328083ea7
3 changed files with 28 additions and 7 deletions
--- a/src/components/views/voip/CallPreview.tsx
+++ b/src/components/views/voip/CallPreview.tsx
@ -184,11 +184,12 @@ export default class CallPreview extends React.Component<IProps, IState> {
                    className="mx_CallPreview"
                    draggable={pipMode}
                >
-                    { (onMouseDownOnHeader) => <CallView
+                    { (onMouseDownOnHeader, onResizeHandler) => <CallView
                        onMouseDownOnHeader={onMouseDownOnHeader}
                        call={this.state.primaryCall}
                        secondaryCall={this.state.secondaryCall}
                        pipMode={pipMode}
+                        onResize={onResize}
                    /> }
                </PictureInPictureDragger>