From 0e28e2e3a2e68056398ea3b5671dbf0c783a0b08 Mon Sep 17 00:00:00 2001 From: dj2ls Date: Wed, 26 Oct 2022 09:38:42 +0200 Subject: [PATCH] resolve merge conflict --- tnc/audio.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tnc/audio.py b/tnc/audio.py index 41190bb6..475cf780 100644 --- a/tnc/audio.py +++ b/tnc/audio.py @@ -42,8 +42,8 @@ def get_audio_devices(): proc.start() proc.join() - log.debug("[AUD] get_audio_devices: input_devices:", list=f"{proxy_input_devices}") - log.debug("[AUD] get_audio_devices: output_devices:", list=f"{proxy_output_devices}") + #log.debug("[AUD] get_audio_devices: input_devices:", list=f"{proxy_input_devices}") + #log.debug("[AUD] get_audio_devices: output_devices:", list=f"{proxy_output_devices}") return list(proxy_input_devices), list(proxy_output_devices)