sasan commited on
Commit
a1ab948
1 Parent(s): 429303d

fix conflicts

Browse files
Files changed (2) hide show
  1. car_assistant.ipynb +0 -0
  2. tts.ipynb +4 -0
car_assistant.ipynb CHANGED
The diff for this file is too large to render. See raw diff
 
tts.ipynb CHANGED
@@ -357,7 +357,11 @@
357
  "outputs": [],
358
  "source": [
359
  "from TTS.vocoder.utils.generic_utils import interpolate_vocoder_input\n",
 
360
  "\n",
 
 
 
361
  "def tts(\n",
362
  " self,\n",
363
  " text: str = \"\",\n",
 
357
  "outputs": [],
358
  "source": [
359
  "from TTS.vocoder.utils.generic_utils import interpolate_vocoder_input\n",
360
+ <<<<<<< Updated upstream
361
  "\n",
362
+ =======
363
+ "# use_gl = self.vocoder_model is None\n",
364
+ >>>>>>> Stashed changes
365
  "def tts(\n",
366
  " self,\n",
367
  " text: str = \"\",\n",