resolve conflicts

wireapp · Jun 24, 2024 · 3948544 · 3948544
1 parent 653f3a7
commit 3948544
Showing 1 changed file with 1 addition and 13 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/OngoingCallScreen.kt b/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/OngoingCallScreen.kt
@@ -137,21 +137,9 @@ fun OngoingCallScreen(
             hangUpCall = { sharedCallingViewModel.hangUpCall { activity.finishAndRemoveTask() } },
             toggleVideo = sharedCallingViewModel::toggleVideo,
             flipCamera = sharedCallingViewModel::flipCamera,
-<<<<<<< HEAD
-            setVideoPreview = {
-                sharedCallingViewModel.setVideoPreview(it)
-                ongoingCallViewModel.startSendingVideoFeed()
-            },
-            clearVideoPreview = {
-                sharedCallingViewModel.clearVideoPreview()
-                ongoingCallViewModel.stopSendingVideoFeed()
-            },
-            onCollapse = { activity.moveTaskToBack(true) },
-=======
             setVideoPreview = sharedCallingViewModel::setVideoPreview,
             clearVideoPreview = sharedCallingViewModel::clearVideoPreview,
-            navigateBack = navigator::navigateBack,
->>>>>>> 37e8ed56b (fix: camera on/off button when in fullscreen [WPB-9815] (#3121))
+            onCollapse = { activity.moveTaskToBack(true) },
             requestVideoStreams = ongoingCallViewModel::requestVideoStreams,
             hideDoubleTapToast = ongoingCallViewModel::hideDoubleTapToast,
             onPermissionPermanentlyDenied = {