From 6500c538e6d03474f2c5dff5338a0dc5ab9a72d6 Mon Sep 17 00:00:00 2001
From: Nicolas Mowen <nickmowen213@gmail.com>
Date: Thu, 7 Aug 2025 21:06:42 -0600
Subject: [PATCH] Cleanup

---
 web/src/pages/ConfigEditor.tsx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/web/src/pages/ConfigEditor.tsx b/web/src/pages/ConfigEditor.tsx
index 1f265428c..364c13252 100644
--- a/web/src/pages/ConfigEditor.tsx
+++ b/web/src/pages/ConfigEditor.tsx
@@ -16,11 +16,8 @@ import { MdOutlineRestartAlt } from "react-icons/md";
 import RestartDialog from "@/components/overlay/dialog/RestartDialog";
 import { useTranslation } from "react-i18next";
 import { useRestart } from "@/api/ws";
-<<<<<<< HEAD
 import { useResizeObserver } from "@/hooks/resize-observer";
-=======
 import { FrigateConfig } from "@/types/frigateConfig";
->>>>>>> 5f40e6e2 (Add basic config editor when Frigate can't startup (#18383))
 
 type SaveOptions = "saveonly" | "restart";