From b2563014ef4ab844d9b75cf5e1ab9dbd398b5136 Mon Sep 17 00:00:00 2001
From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com>
Date: Sat, 17 Aug 2024 12:46:33 -0500
Subject: [PATCH] resolve conflicts

---
 web/src/views/live/LiveDashboardView.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/views/live/LiveDashboardView.tsx b/web/src/views/live/LiveDashboardView.tsx
index 26db97cdf2..cac604e268 100644
--- a/web/src/views/live/LiveDashboardView.tsx
+++ b/web/src/views/live/LiveDashboardView.tsx
@@ -30,8 +30,8 @@ import { LuLayoutDashboard } from "react-icons/lu";
 import { cn } from "@/lib/utils";
 import { LivePlayerError } from "@/types/live";
 import { FaCompress, FaExpand } from "react-icons/fa";
-import { useResizeObserver } from "@/hooks/resize-observer";
 import useCameraLiveMode from "@/hooks/use-camera-live-mode";
+import { useResizeObserver } from "@/hooks/resize-observer";
 
 type LiveDashboardViewProps = {
   cameras: CameraConfig[];