resolve merge conflict

This commit is contained in:
dj2ls 2022-10-26 09:38:42 +02:00
parent 5acdc338ba
commit 0e28e2e3a2

View file

@ -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)