From 8912e0696af069de47646fdb8a9d9c4e086e88b3 Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期日, 14 一月 2024 23:42:11 +0800
Subject: [PATCH] Resolve merge conflict

---
 runtime/docs/docker_offline_cpu_zh_lists |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/runtime/docs/docker_offline_cpu_zh_lists b/runtime/docs/docker_offline_cpu_zh_lists
index 5d1cd20..20763c0 100644
--- a/runtime/docs/docker_offline_cpu_zh_lists
+++ b/runtime/docs/docker_offline_cpu_zh_lists
@@ -1,7 +1,7 @@
 DOCKER:
+  funasr-runtime-sdk-cpu-0.4.0
   funasr-runtime-sdk-cpu-0.3.0
   funasr-runtime-sdk-cpu-0.2.2
-  funasr-runtime-sdk-cpu-0.2.1
 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

--
Gitblit v1.9.1