From 4391e9cc26b65a7b88d1af492724cd836c1b5bcb Mon Sep 17 00:00:00 2001
From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com>
Date: Mon, 7 Oct 2024 09:30:49 -0500
Subject: [PATCH] resolve conflict

---
 frigate/app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frigate/app.py b/frigate/app.py
index ac35de0a0..6b0e49949 100644
--- a/frigate/app.py
+++ b/frigate/app.py
@@ -91,9 +91,9 @@ class FrigateApp:
         self.camera_metrics: dict[str, CameraMetrics] = {}
         self.ptz_metrics: dict[str, PTZMetrics] = {}
         self.processes: dict[str, int] = {}
+        self.embeddings: Optional[EmbeddingsContext] = None
         self.region_grids: dict[str, list[list[dict[str, int]]]] = {}
         self.config: FrigateConfig = config
-        self.embeddings: Optional[EmbeddingsContext] = None
 
     def ensure_dirs(self) -> None:
         for d in [