From 26c5620853e93fb818a2bbccf7ab626e4594e088 Mon Sep 17 00:00:00 2001
From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com>
Date: Tue, 24 Sep 2024 07:52:16 -0500
Subject: [PATCH] fix merge conflicts

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

diff --git a/frigate/app.py b/frigate/app.py
index 2799d47b8..580ddb6a9 100644
--- a/frigate/app.py
+++ b/frigate/app.py
@@ -661,6 +661,7 @@ class FrigateApp:
                 self.onvif_controller,
                 self.external_event_processor,
                 self.stats_emitter,
+                self.event_metadata_updater,
             ).run(host="127.0.0.1", port=5001, debug=False, threaded=True)
         finally:
             self.stop()