From 5e4e2abe7e6c8a60fa6ecb035f0fdd50ffa2f3a5 Mon Sep 17 00:00:00 2001
From: Felix Boehme <felix@boehmies.de>
Date: Sat, 2 Sep 2023 16:30:37 +0200
Subject: [PATCH] resolve merge issue

---
 src/_oldvideo/components/actions/CaptionRendererAction.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/_oldvideo/components/actions/CaptionRendererAction.tsx b/src/_oldvideo/components/actions/CaptionRendererAction.tsx
index a5a77a02..7a631a8f 100644
--- a/src/_oldvideo/components/actions/CaptionRendererAction.tsx
+++ b/src/_oldvideo/components/actions/CaptionRendererAction.tsx
@@ -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";