From 28e105bc81c5d07860795f80b9221c4c926c23a4 Mon Sep 17 00:00:00 2001 From: Mitch Ross Date: Tue, 6 Jun 2023 22:37:11 -0400 Subject: [PATCH] conflict --- frigate/http.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frigate/http.py b/frigate/http.py index 4873b3183..df0565dd9 100644 --- a/frigate/http.py +++ b/frigate/http.py @@ -40,7 +40,7 @@ from frigate.monitoring.prometheus import setupRegistry from frigate.monitoring.stats import stats_snapshot from frigate.plus import PlusApi from frigate.ptz import OnvifController -from frigate.stats import stats_snapshot +from frigate.monitoring.stats import stats_snapshot from frigate.storage import StorageMaintainer from frigate.util import ( clean_camera_user_pass,