From 492be9aeca4ad09308a2450f3f21bad901f985af Mon Sep 17 00:00:00 2001
From: Nick Mowen <nickmowen213@gmail.com>
Date: Thu, 6 Jul 2023 07:38:34 -0600
Subject: [PATCH] Cleanup

---
 frigate/app.py        |  2 +-
 frigate/util/image.py | 20 --------------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/frigate/app.py b/frigate/app.py
index ed32dee17..96c2f1d27 100644
--- a/frigate/app.py
+++ b/frigate/app.py
@@ -47,7 +47,7 @@ from frigate.stats import StatsEmitter, stats_init
 from frigate.storage import StorageMaintainer
 from frigate.timeline import TimelineProcessor
 from frigate.types import CameraMetricsTypes, FeatureMetricsTypes
-from frigate.util import LimitedQueue as LQueue
+from frigate.util.builtin import LimitedQueue as LQueue
 from frigate.version import VERSION
 from frigate.video import capture_camera, track_camera
 from frigate.watchdog import FrigateWatchdog
diff --git a/frigate/util/image.py b/frigate/util/image.py
index 2a59e93a4..8a41498b9 100644
--- a/frigate/util/image.py
+++ b/frigate/util/image.py
@@ -1,34 +1,14 @@
-<<<<<<< HEAD:frigate/util/image.py
 """Utilities for creating and manipulating image frames."""
 
-=======
-import copy
-import ctypes
->>>>>>> 2fae9dcb93f41936ee1907fc0813719c8559fe1b:frigate/util.py
 import datetime
 import logging
 
 from abc import ABC, abstractmethod
 from multiprocessing import shared_memory
-<<<<<<< HEAD:frigate/util/image.py
 from typing import AnyStr, Optional
 
 import cv2
 import numpy as np
-=======
-from queue import Empty, Full
-from typing import Any, AnyStr, Optional, Tuple
-
-import cv2
-import numpy as np
-import psutil
-import py3nvml.py3nvml as nvml
-import pytz
-import yaml
-
-
-from frigate.const import REGEX_HTTP_CAMERA_USER_PASS, REGEX_RTSP_CAMERA_USER_PASS
->>>>>>> 2fae9dcb93f41936ee1907fc0813719c8559fe1b:frigate/util.py
 
 logger = logging.getLogger(__name__)