Skip to content

Commit

Permalink
resolve merge conflict in video input
Browse files Browse the repository at this point in the history
  • Loading branch information
TongguangZhang committed Mar 24, 2024
1 parent 63d49f9 commit 864410c
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions modules/video_input/video_input.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 864410c

Please sign in to comment.