mirror of
https://github.com/sussy-code/smov.git
synced 2024-12-29 16:07:40 +01:00
resolve merge issue
This commit is contained in:
parent
fcebbf404d
commit
5e4e2abe7e
1 changed files with 1 additions and 1 deletions
|
@ -5,7 +5,7 @@ import { ContentCaption } from "subsrt-ts/dist/types/handler";
|
||||||
import { parseSubtitles, sanitize } from "@/backend/helpers/captions";
|
import { parseSubtitles, sanitize } from "@/backend/helpers/captions";
|
||||||
import { Transition } from "@/components/Transition";
|
import { Transition } from "@/components/Transition";
|
||||||
import { useSettings } from "@/state/settings";
|
import { useSettings } from "@/state/settings";
|
||||||
import { getPlayerState } from "@/video/state/cache";
|
import { getPlayerState } from "@/_oldvideo/state/cache";
|
||||||
|
|
||||||
import { useVideoPlayerDescriptor } from "../../state/hooks";
|
import { useVideoPlayerDescriptor } from "../../state/hooks";
|
||||||
import { useProgress } from "../../state/logic/progress";
|
import { useProgress } from "../../state/logic/progress";
|
||||||
|
|
Loading…
Reference in a new issue