From 067c26f2717aa3640172fdbadcb3118ad2d9ee17 Mon Sep 17 00:00:00 2001
From: dhoeben <douwehoeben@gmail.com>
Date: Tue, 23 Dec 2025 18:17:56 +0100
Subject: [PATCH] Fix linting

---
 frigate/api/app.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/frigate/api/app.py b/frigate/api/app.py
index 84e01a465..50012ae88 100644
--- a/frigate/api/app.py
+++ b/frigate/api/app.py
@@ -33,11 +33,8 @@ from frigate.config.camera.updater import (
     CameraConfigUpdateEnum,
     CameraConfigUpdateTopic,
 )
-<<<<<<< HEAD
-from frigate.ffmpeg_presets import FFMPEG_HWACCEL_VAAPI, _gpu_selector
-=======
 from frigate.const import THEMES_DIR
->>>>>>> a3cdd1b1 (Add custom theme support)
+from frigate.ffmpeg_presets import FFMPEG_HWACCEL_VAAPI, _gpu_selector
 from frigate.models import Event, Timeline
 from frigate.stats.prometheus import get_metrics, update_metrics
 from frigate.util.builtin import (
@@ -188,6 +185,7 @@ def config(request: Request):
 
     return JSONResponse(content=config)
 
+
 @router.get("/config/themes")
 def config_themes():
     themes_dir = THEMES_DIR
@@ -209,6 +207,7 @@ def config_themes():
 
     return JSONResponse(content=themes)
 
+
 @router.get("/config/raw_paths", dependencies=[Depends(require_role(["admin"]))])
 def config_raw_paths(request: Request):
     """Admin-only endpoint that returns camera paths and go2rtc streams without credential masking."""