nug fix

2018-11-28 16:37:59 +01:00 · 2018-11-28 16:37:59 +01:00 · 6488d5e305
parent 7730ef6bff
commit 6488d5e305
1 changed files with 0 additions and 4 deletions
--- a/utils/audio.py
+++ b/utils/audio.py
@ -26,11 +26,7 @@ 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...")