resolve conflict

aky15

2023-04-12 dccbcc48a583eb38b4bc5b459d417087826846ac

1
2
3
4
5
# -*- encoding: utf-8 -*-
from .paraformer_bin import Paraformer
from .vad_bin import Fsmn_vad
from .punc_bin import CT_Transformer
from .punc_bin import CT_Transformer_VadRealtime