From b6c2bfdf086c2404d78b198a8f4a34d352c015b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eren=20G=C3=B6lge?= <egolge@coqui.ai>
Date: Tue, 16 Nov 2021 13:34:45 +0100
Subject: [PATCH] Refactor synthesis.py for TTSTokenizer

---
 TTS/tts/utils/synthesis.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/TTS/tts/utils/synthesis.py b/TTS/tts/utils/synthesis.py
index 7bbc282f..979769a8 100644
--- 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,