resolve conflicts

This commit is contained in:
marcoyang 2022-11-03 11:12:49 +08:00
commit f45d9c4383

View File

@ -329,7 +329,7 @@ def get_parser():
"--rnn-lm-scale", "--rnn-lm-scale",
type=float, type=float,
default=0.0, default=0.0,
help="""Used only when --method is modified_beam_search_rnnlm_shallow_fusion. help="""Used only when --method is modified-beam-search_rnnlm_shallow_fusion.
It specifies the path to RNN LM exp dir. It specifies the path to RNN LM exp dir.
""", """,
) )