avoid merge conflict

This commit is contained in:
Jaikinator
2024-02-12 12:40:51 +01:00
parent 6aa25dfec1
commit 8af2294814
+1 -3
View File
@@ -212,9 +212,7 @@ class Diariser:
if not os.path.exists(model) and use_auth_token is None: if not os.path.exists(model) and use_auth_token is None:
use_auth_token = cls._get_token() use_auth_token = cls._get_token()
model = 'pyannote/speaker-diarization'
elif not os.path.exists(model) and use_auth_token is not None:
model = 'pyannote/speaker-diarization'
elif os.path.exists(model) and not use_auth_token: elif os.path.exists(model) and not use_auth_token:
# check if model can be found locally nearby the config file # check if model can be found locally nearby the config file
with open(model, 'r') as file: with open(model, 'r') as file: