update with main (#1786)

zhifu gao

2024-06-06 32e783664534bbb8d3b8ba64c2c2ecb42398eb00

 funasr/models/conformer/model.py

@@ -5,11 +5,11 @@
from funasr.models.transformer.model import Transformer
from funasr.register import tables


@tables.register("model_classes", "Conformer")
class Conformer(Transformer):
    """CTC-attention hybrid Encoder-Decoder model"""

    
    def __init__(
        self,
        *args,