Resolve merge conflict
This commit is contained in:
@@ -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<VideoWidget> {
|
||||
onFinalFileLoad: widget.onFinalFileLoad,
|
||||
);
|
||||
}
|
||||
return VideoWidgetMediaKit(
|
||||
return VideoWidgetMediaKitNew(
|
||||
widget.file,
|
||||
key: mediaKitKey,
|
||||
tagPrefix: widget.tagPrefix,
|
||||
|
||||
Reference in New Issue
Block a user