From 1f5972426ed47906e0fedc89265f86438005a62b Mon Sep 17 00:00:00 2001 From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com> Date: Wed, 16 Sep 2026 11:19:45 -0500 Subject: [PATCH] fix merge conflict --- web/src/components/player/LivePlayer.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/src/components/player/LivePlayer.tsx b/web/src/components/player/LivePlayer.tsx index 1570cbe69a..45a1dc1b20 100644 --- a/web/src/components/player/LivePlayer.tsx +++ b/web/src/components/player/LivePlayer.tsx @@ -412,10 +412,8 @@ export default function LivePlayer({ !offline && (!showStillWithoutActivity || isReEnabling) && !liveReady && ( - (
- )
)}