resolve merge conflicts in tv page (merge password + quality/subtitle features)

2026-07-12 03:41:20 +02:00
parent 8051ab58c0
commit f2f56b7143
2 changed files with 4 additions and 5 deletions
--- a/k-tv-frontend/app/(main)/tv/page.tsx
+++ b/k-tv-frontend/app/(main)/tv/page.tsx
@@ -89,7 +89,6 @@ function TvPageContent() {
    error: broadcastError,
  } = useCurrentBroadcast(channel?.id ?? "", passwords.channelPassword);

-  // blockPassword derived from broadcast.slot.id after broadcast loads
  const blockPassword = passwords.getBlockPassword(broadcast?.slot.id);

  const { data: epgSlots } = useEpg(