From e02fe8bba128ad3f0fe0f33cca6acb10e7655c69 Mon Sep 17 00:00:00 2001
From: Nick Mowen <nickmowen213@gmail.com>
Date: Wed, 26 Apr 2023 07:15:00 -0600
Subject: [PATCH] Fix rebase issue

---
 frigate/app.py              | 6 +++++-
 frigate/comms/dispatcher.py | 4 ----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frigate/app.py b/frigate/app.py
index b78099fb6..095a51e36 100644
--- a/frigate/app.py
+++ b/frigate/app.py
@@ -209,7 +209,11 @@ class FrigateApp:
 
         comms.append(WebSocketClient(self.config))
         self.dispatcher = Dispatcher(
-            self.config, self.onvif_controller, self.camera_metrics, self.record_metrics, comms
+            self.config,
+            self.onvif_controller,
+            self.camera_metrics,
+            self.record_metrics,
+            comms,
         )
 
     def start_detectors(self) -> None:
diff --git a/frigate/comms/dispatcher.py b/frigate/comms/dispatcher.py
index 0ba3e0e68..4f3bdd2fd 100644
--- a/frigate/comms/dispatcher.py
+++ b/frigate/comms/dispatcher.py
@@ -7,12 +7,8 @@ from typing import Any, Callable
 from abc import ABC, abstractmethod
 
 from frigate.config import FrigateConfig
-<<<<<<< HEAD
 from frigate.ptz import OnvifController, OnvifCommandEnum
-from frigate.types import CameraMetricsTypes
-=======
 from frigate.types import CameraMetricsTypes, RecordMetricsTypes
->>>>>>> ab49f2f7 (Add support back for setting record via MQTT and WS)
 from frigate.util import restart_frigate