Merge branch 'dev' of github.com:mozilla/TTS into dev

2018-11-28 16:34:03 +01:00 · 2018-11-28 16:34:03 +01:00 · 7730ef6bff
parent cdaaff9dbb 0f0bde935c
commit 7730ef6bff
1 changed files with 4 additions and 0 deletions
--- a/utils/audio.py
+++ b/utils/audio.py
@ -26,7 +26,11 @@ class AudioProcessor(object):
                 mel_fmax=None,
                 clip_norm=True,
                 griffin_lim_iters=None,
+<<<<<<< HEAD
                 do_trim_silence=False,
+=======
+                 do_trim_silence=False
+>>>>>>> 0f0bde935ceec25f93117ff6d507f19162101041
                 **kwargs):

        print(" > Setting up Audio Processor...")