From 864410c5b8852b459733fc9d117d3a9845d34152 Mon Sep 17 00:00:00 2001
From: TongguangZhang <tonggz250@gmail.com>
Date: Sun, 24 Mar 2024 15:26:39 -0400
Subject: [PATCH] resolve merge conflict in video input

---
 modules/video_input/video_input.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/video_input/video_input.py b/modules/video_input/video_input.py
index 8df757bd..a68a4d37 100644
--- a/modules/video_input/video_input.py
+++ b/modules/video_input/video_input.py
@@ -14,12 +14,11 @@ class VideoInput:
     """
     Combines image and timestamp together.
     """
-
     def __init__(
         self,
         logging_queue: queue_proxy_wrapper.QueueProxyWrapper,
         camera_name: "int | str",
-        save_name: str = ""
+        save_name: str = "",
     ) -> None:
         self.device = camera_device.CameraDevice(camera_name, 1, save_name)
         self.logging_queue = logging_queue