Resolve merge conflict

游雁

2024-01-14 8912e0696af069de47646fdb8a9d9c4e086e88b3

 runtime/docs/docker_online_cpu_zh_lists

@@ -1,7 +1,7 @@
DOCKER:
  funasr-runtime-sdk-online-cpu-0.1.6
  funasr-runtime-sdk-online-cpu-0.1.5
  funasr-runtime-sdk-online-cpu-0.1.3
  funasr-runtime-sdk-online-cpu-0.1.2
DEFAULT_ASR_MODEL:
  damo/speech_paraformer-large_asr_nat-zh-cn-16k-common-vocab8404-onnx
  damo/speech_paraformer-large-vad-punc_asr_nat-zh-cn-16k-common-vocab8404-onnx