small fixes

Makefile

@@ -14,7 +14,7 @@ deps:	## install 🐸 requirements.
 	pip install -r requirements.txt
 
 test:	## run tests.
-	nosetests --with-cov -cov  --cover-erase --cover-package TTS tests
+	nosetests -x --with-cov -cov  --cover-erase --cover-package TTS tests
 	./run_bash_tests.sh
 
 style:	## update code style.

TTS/bin/train_vocoder_wavernn.py

@@ -24,10 +24,6 @@ from TTS.vocoder.utils.io import save_best_model, save_checkpoint
 
 # from torch.utils.data.distributed import DistributedSampler
 
-<<<<<<< HEAD
-
-=======
->>>>>>> reformat
 
 use_cuda, num_gpus = setup_torch_training_env(True, True)
 

TTS/tts/tf/models/tacotron2.py

@@ -28,11 +28,7 @@ class Tacotron2(keras.models.Model):
         bidirectional_decoder=False,
         enable_tflite=False,
     ):
-<<<<<<< HEAD
-        super(Tacotron2, self).__init__()
-=======
         super().__init__()
->>>>>>> reformat
         self.r = r
         self.decoder_output_dim = decoder_output_dim
         self.postnet_output_dim = postnet_output_dim