From b1837dec7532cbeece9a1fe5d8fad094a86bf4e5 Mon Sep 17 00:00:00 2001 From: AmanRajSinghMourya Date: Wed, 11 Jun 2025 18:28:41 +0530 Subject: [PATCH] Resolve merge conflict --- mobile/lib/ui/viewer/file/video_widget.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mobile/lib/ui/viewer/file/video_widget.dart b/mobile/lib/ui/viewer/file/video_widget.dart index 9d536bc88f..bcc78adbfe 100644 --- a/mobile/lib/ui/viewer/file/video_widget.dart +++ b/mobile/lib/ui/viewer/file/video_widget.dart @@ -14,8 +14,8 @@ import "package:photos/service_locator.dart"; import "package:photos/services/preview_video_store.dart"; import "package:photos/theme/colors.dart"; import "package:photos/ui/common/loading_widget.dart"; -import "package:photos/ui/notification/toast.dart"; -import "package:photos/ui/viewer/file/video_widget_media_kit.dart"; +import "package:photos/ui/notification/toast.dart"; +import "package:photos/ui/viewer/file/video_widget_media_kit_new.dart"; import "package:photos/ui/viewer/file/video_widget_native.dart"; import "package:photos/utils/standalone/data.dart"; @@ -171,7 +171,7 @@ class _VideoWidgetState extends State { onFinalFileLoad: widget.onFinalFileLoad, ); } - return VideoWidgetMediaKit( + return VideoWidgetMediaKitNew( widget.file, key: mediaKitKey, tagPrefix: widget.tagPrefix,