Browse Source

resolve merge issue

pull/419/head
Felix Boehme 2 years ago
parent
commit
5e4e2abe7e
No known key found for this signature in database
GPG Key ID: 7EB0603E4E9642EA
  1. 2
      src/_oldvideo/components/actions/CaptionRendererAction.tsx

2
src/_oldvideo/components/actions/CaptionRendererAction.tsx

@ -5,7 +5,7 @@ import { ContentCaption } from "subsrt-ts/dist/types/handler"; @@ -5,7 +5,7 @@ import { ContentCaption } from "subsrt-ts/dist/types/handler";
import { parseSubtitles, sanitize } from "@/backend/helpers/captions";
import { Transition } from "@/components/Transition";
import { useSettings } from "@/state/settings";
import { getPlayerState } from "@/video/state/cache";
import { getPlayerState } from "@/_oldvideo/state/cache";
import { useVideoPlayerDescriptor } from "../../state/hooks";
import { useProgress } from "../../state/logic/progress";

Loading…
Cancel
Save