Resolve merge conflict

游雁

2024-01-14 8912e0696af069de47646fdb8a9d9c4e086e88b3

1
2
3
4
5
6
7
8
DOCKER:
  funasr-runtime-sdk-en-cpu-0.1.2
DEFAULT_ASR_MODEL:
  damo/speech_paraformer-large_asr_nat-en-16k-common-vocab10020-onnx
DEFAULT_VAD_MODEL:
  damo/speech_fsmn_vad_zh-cn-16k-common-onnx
DEFAULT_PUNC_MODEL:
  damo/punc_ct-transformer_cn-en-common-vocab471067-large-onnx