KyraWNY commited on
Commit
3aef71e
1 Parent(s): a12d47a
Files changed (1) hide show
  1. config.yaml +0 -5
config.yaml CHANGED
@@ -21,12 +21,7 @@ transforms:
21
  vocab_filename: vocab.txt
22
  vocoder:
23
  type: hifigan
24
- <<<<<<< HEAD:config.yaml
25
  config: hifigan.json
26
  checkpoint: hifigan.bin
27
  inference:
28
  tokenization: g2p
29
- =======
30
- config: hifigan.json
31
- checkpoint: hifigan.bin
32
- >>>>>>> f2e684c06cd3e5a029e79a4fcf7a9508d97c0124:benchmark_a/config.yaml
 
21
  vocab_filename: vocab.txt
22
  vocoder:
23
  type: hifigan
 
24
  config: hifigan.json
25
  checkpoint: hifigan.bin
26
  inference:
27
  tokenization: g2p