Refactor synthesis.py for TTSTokenizer

2021-11-16 13:34:45 +01:00 · 2021-11-16 13:34:45 +01:00 · b6c2bfdf08
parent b2bb954a51
commit b6c2bfdf08
1 changed files with 0 additions and 3 deletions
--- a/TTS/tts/utils/synthesis.py
+++ b/TTS/tts/utils/synthesis.py
@ -113,11 +113,8 @@ def synthesis(
    text,
    CONFIG,
    use_cuda,
-<<<<<<< HEAD
-=======
    ap,
    tokenizer,
->>>>>>> Refactor synthesis.py for TTSTokenizer
    speaker_id=None,
    style_wav=None,
    use_griffin_lim=False,